diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-18 14:49:59 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-18 14:49:59 (GMT) |
| commit | d32466912ea1f5a0ced568c4884f6c7d335ea969 (patch) | |
| tree | 3bc1b8d5f7b409767486883a2482e84807a47141 /drivers/acpi/battery.c | |
| parent | 74fe030532d779a3774fcc9e1ddce65f3773e156 (diff) | |
| parent | 07146648bc6ea8b1530644c8a41bef55f1b2d952 (diff) | |
| download | linux-fsl-qoriq-d32466912ea1f5a0ced568c4884f6c7d335ea969.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: update key codes for Apple aluminium
HID: fix comment in hid_input_report()
HID: BADPAD entry for NATSU Playstation USB adapter
HID: Use DIV_ROUND_UP
HID: remove HID_QUIRK_APPLE_ISO_KEYBOARD for 4th generation macbook
Diffstat (limited to 'drivers/acpi/battery.c')
0 files changed, 0 insertions, 0 deletions