aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-generic.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-29 14:15:32 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-29 14:15:32 -0500
commit499a2673713c85734a54c37dd90b4b729de399c4 (patch)
tree426f8e4c7c792dad998beeefb094c439a81b776b /drivers/ide/ide-generic.c
parenta7016235a61d520e6806f38129001d935c4b6661 (diff)
parentf6bdc2303da6786cc22a7d24b6790e9f75b4cfdc (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: update multi-touch protocol documentation Input: add the ABS_MT_PRESSURE event Input: winbond-cir - remove dmesg spam Input: lifebook - add another Lifebook DMI signature Input: ad7879 - support auxiliary GPIOs via gpiolib
Diffstat (limited to 'drivers/ide/ide-generic.c')
0 files changed, 0 insertions, 0 deletions