aboutsummaryrefslogtreecommitdiff
path: root/drivers/pcmcia/sa1100_assabet.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-06 21:47:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-06 21:47:30 -0700
commit7686ad5606f08d9dfb33a2087a36c8366366015b (patch)
treeda2b7739ccf603949b3ecc3aa55884efb19dd7f8 /drivers/pcmcia/sa1100_assabet.c
parent64f996f670e9477072a43b226294ea1cc153f6ac (diff)
parent9ce1ca284a322ba6f9d691136a29c9cfe381e1fc (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: i8042 - make Lenovo 3000 N100 blacklist entry more specific Input: bcm5974 - add BTN_TOUCH event for mousedev benefit Input: bcm5974 - improve finger tracking and counting Input: bcm5974 - small formatting cleanup Input: bcm5974 - add maintainer entry
Diffstat (limited to 'drivers/pcmcia/sa1100_assabet.c')
0 files changed, 0 insertions, 0 deletions