The following commit has been merged in the linux branch: commit 1c211849d893b14cc923a18708923954fdd2c63e Merge: fcef24d38e8f974673d158866e60763ac4f2161b 558a5e296a02266ef43d6e933ee35df9976de987 Author: Linus Torvalds torvalds@linux-foundation.org Date: Tue Nov 3 07:46:17 2009 -0800

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