1. 07 8月, 2006 4 次提交
    • J
      Merge branch 'master' into upstream · 242898be
      Jeff Garzik 提交于
      242898be
    • L
      Linux v2.6.18-rc4 · 9f737633
      Linus Torvalds 提交于
      9f737633
    • L
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input · 6e1e6325
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input: (24 commits)
        Input: ati_remote - use msec instead of jiffies
        Input: ati_remote - add missing input_sync()
        Input: ati_remote - relax permissions sysfs module parameters
        Input: ati_remote - make filter time a module parameter
        Input: atkbd - restore repeat rate when resuming
        Input: trackpoint - activate protocol when resuming
        Input: logips2pp - fix button mapping for MX300
        Input: keyboard - change to use kzalloc
        Input: serio/gameport - check whether driver core calls succeeded
        Input: spaceball - make 4000FLX Lefty work
        Input: keyboard - simplify emulate_raw() implementation
        Input: keyboard - remove static variable and clean up initialization
        Input: hiddev - use standard list implementation
        Input: add missing handler->start() call
        Input: HID - fix potential out-of-bound array access
        Input: fix list iteration in input_release_device()
        Input: iforce - add Trust Force Feedback Race Master support
        Input: iforce - check array bounds before accessing elements
        Input: libps2 - warn instead of oopsing when passed bad arguments
        Input: fm801-gp - fix use after free
        ...
      6e1e6325
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa · a05ef8bf
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
        [ALSA] Don't reject O_RDWR at opening PCM OSS with read/write-only device
        [ALSA] snd-emu10k1: Implement support for Audigy 2 ZS [SB0353]
        [ALSA] add MAINTAINERS entry for snd-aoa
        [ALSA] aoa: platform function gpio: ignore errors from functions that don't exist
        [ALSA] make snd-powermac load even when it can't bind the device
        [ALSA] aoa: fix toonie codec
        [ALSA] aoa: feature gpio layer: fix IRQ access
        [ALSA] Conversions from kmalloc+memset to k(z|c)alloc
        [ALSA] snd-emu10k1: Fixes ALSA bug#2190
      a05ef8bf
  2. 06 8月, 2006 36 次提交