summaryrefslogtreecommitdiff
path: root/drivers/hid/hid-input.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-25 07:45:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-25 07:45:10 -0700
commit8e775167d54e6521e7cdbc03ee7ec42a8c67b49a (patch)
treea49914306fb28505c6e21a456df8bdc40d6eac23 /drivers/hid/hid-input.c
parent4b37ba90f49d4157ac5628f8d730d3505f176724 (diff)
parentf253b86b4ad1b3220544e75880510fd455ebd23f (diff)
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: Revert "block: fix accounting bug on cross partition merges"
Diffstat (limited to 'drivers/hid/hid-input.c')
0 files changed, 0 insertions, 0 deletions