diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-17 11:20:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-17 11:20:57 -0400 |
| commit | 20f85957667ccc53183b5ffac22213d75e317408 (patch) | |
| tree | d3db6c50c32dac25757d6f7dff977ccadc28a714 /drivers/input/misc/wistron_btns.c | |
| parent | 7786ce192fc4917fb9b789dd823476ff8fd6cf66 (diff) | |
| parent | 284a940675a64df253e3dffc60b09bb4bbb149e4 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Check for offline nodes in pci NUMA code
[POWERPC] Better check in show_instructions
[POWERPC] POWER6 has 6 PMCs
[POWERPC] Never panic when taking altivec exceptions from userspace
[POWERPC] Fix IO Window Updates on P2P bridges.
[POWERPC] Add Makefile entry for MPC832x_mds support
[POWERPC] Fix MPC8360EMDS PB board support
[POWERPC] ppc: Add missing calls to set_irq_regs
[POWERPC] Off-by-one in /arch/ppc/platforms/mpc8*
[POWERPC] Add DOS partition table support to mpc834x_itx_defconfig
[POWERPC] spufs: fix support for read/write on cntl
[POWERPC] Don't crash on cell with 2 BEs when !CONFIG_NUMA
Diffstat (limited to 'drivers/input/misc/wistron_btns.c')
0 files changed, 0 insertions, 0 deletions