summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-03 07:46:17 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-03 07:46:17 -0800
commit1c211849d893b14cc923a18708923954fdd2c63e (patch)
treea5a84e45126e3aeb4c4a77648a047aeba93a5e68 /drivers/macintosh
parentfcef24d38e8f974673d158866e60763ac4f2161b (diff)
parent558a5e296a02266ef43d6e933ee35df9976de987 (diff)
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 'drivers/macintosh')
0 files changed, 0 insertions, 0 deletions