diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-26 04:41:00 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-26 04:41:00 +0100 |
| commit | 874f2f997dbe041a6c6e509dae8656ed9022d65d (patch) | |
| tree | 61898165882041ef7f9beaf2ef6663a1a4d3c29a /arch/powerpc/lib/feature-fixups.c | |
| parent | powerpc: Convert pmc_owner_lock to raw_spinlock (diff) | |
| parent | Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 (diff) | |
| download | linux-874f2f997dbe041a6c6e509dae8656ed9022d65d.tar.xz linux-874f2f997dbe041a6c6e509dae8656ed9022d65d.zip | |
Merge commit 'origin/master' into next
Manual merge of:
drivers/char/hvc_console.c
drivers/char/hvc_console.h
Diffstat (limited to 'arch/powerpc/lib/feature-fixups.c')
0 files changed, 0 insertions, 0 deletions