From: Linus Torvalds Date: Tue, 3 Nov 2009 15:46:17 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input X-Git-Tag: v2.6.32-rc6~5 X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=1c211849d893b14cc923a18708923954fdd2c63e;p=cascardo%2Flinux.git Merge branch 'for-linus' of git://git./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 --- 1c211849d893b14cc923a18708923954fdd2c63e