diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-12 07:57:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-12 07:57:00 -0700 |
| commit | 532df780a2012ad75b3f078647f229c4dabd99d1 (patch) | |
| tree | 6172d647f9c7bbd770bcd5f9f002108d671ce24f /include/asm-powerpc/pmi.h | |
| parent | 577107e8e4cf9f6f4f5ef8350ac9a8faa6c3796d (diff) | |
| parent | 7b6dff982b063b1b15c30508f16863e5449e7229 (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: usbtouchscreen - correctly set 'phys'
Input: i8042 - add HP Pavilion DV4270ca to the MUX blacklist
Input: i8042 - fix modpost warning
Input: add more Braille keycodes
Diffstat (limited to 'include/asm-powerpc/pmi.h')
0 files changed, 0 insertions, 0 deletions