1. 18 10月, 2006 38 次提交
  2. 17 10月, 2006 2 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 43f82216
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: fm801-gp - handle errors from pci_enable_device()
        Input: gameport core - handle errors returned by device_bind_driver()
        Input: serio core - handle errors returned by device_bind_driver()
        Lockdep: fix compile error in drivers/input/serio/serio.c
        Input: serio - add lockdep annotations
        Lockdep: add lockdep_set_class_and_subclass() and lockdep_set_subclass()
        Input: atkbd - supress "too many keys" error message
        Input: i8042 - supress ACK/NAKs when blinking during panic
        Input: add missing exports to fix modular build
      43f82216
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 20f85957
      Linus Torvalds 提交于
      * '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
      20f85957