diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 13:41:29 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 13:41:29 -0700 |
commit | 63995344721be45b3fb3b76488b1b0a8c95def26 (patch) | |
tree | a28385324c992c75bd7895fcfd3e374b5214aa53 /init | |
parent | 9de6886ec6e37f45807266a702bb7621498395ad (diff) | |
parent | 2bcaa6a4238094c5695d5b1943078388d82d3004 (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: atkbd - add Compaq Presario R4000-series repeat quirk
Input: i8042 - add Acer Aspire 5536 to the nomux list
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions