| commit | 2485a4b610171f4e1c4ab0d053569747795c1bbe | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 12 12:40:41 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 12 12:40:41 2012 -0800 |
| tree | 1a4532e447c2640bc1378e25e1ead9a7ba7847a5 | |
| parent | 6733e54b669c600eb8e451939ad55130db664fed [diff] | |
| parent | 52965cc012f7a3cf35f06485ec275ebf3b3fddae [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: bcm5974 - set BUTTONPAD property Input: serio_raw - return proper result when serio_raw_write fails Input: serio_raw - really signal HUP upon disconnect Input: serio_raw - remove stray semicolon Input: revert some over-zealous conversions to module_platform_driver()