diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-03 16:46:17 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-03 16:46:17 +0100 |
commit | 1c211849d893b14cc923a18708923954fdd2c63e (patch) | |
tree | a5a84e45126e3aeb4c4a77648a047aeba93a5e68 /kernel | |
parent | Merge branch 'fixes-s3c-2632-rc5' of git://git.fluff.org/bjdooks/linux (diff) | |
parent | Input: gpio-keys - use IRQF_SHARED (diff) | |
download | linux-1c211849d893b14cc923a18708923954fdd2c63e.tar.xz linux-1c211849d893b14cc923a18708923954fdd2c63e.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: gpio-keys - use IRQF_SHARED
Input: winbond-cir - select LEDS_TRIGGERS
Input: i8042 - try to get stable CTR value when initializing
Input: atkbd - add a quirk for OQO 01+ multimedia keys
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions