diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-20 21:39:33 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-20 21:39:33 +0400 |
| commit | 73bebc8bafb6a880a4db63d60bc4b8d9d6879c9e (patch) | |
| tree | 94c107c369f0334b67649711d4b019abbb3e5382 /fs/xfs/xfs_discard.c | |
| parent | edaf6c38344b026aec8be852bf7ddd9916eedf9e (diff) | |
| parent | 2198edddd8f0245d4c47419310c6cfb0f4e1a197 (diff) | |
| download | linux-73bebc8bafb6a880a4db63d60bc4b8d9d6879c9e.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
"Fix for one particular device (bluetooth Tivo Slide) and change of
'default y' -> 'default n' for CONFIG_HID_BATTERY_STRENGTH which I
overlooked in the initial merge of the battery support"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: default HID_BATTERY_STRENGTH to no
HID: tivo: fix support for bluetooth version of tivo Slide
Diffstat (limited to 'fs/xfs/xfs_discard.c')
0 files changed, 0 insertions, 0 deletions