summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/serport.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-30 13:58:23 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-30 13:58:23 -0800
commitf8a2cee0911fca04dab114ebd961aa564b3e65c3 (patch)
treec2816db88a4c15f835e00232c013f989156e7cee /drivers/input/serio/serport.c
parenta5e63931fd36b7c24e383106ac0f4523cf179206 (diff)
parent31769cef2e973544164aa7d0db2e2024660d5e21 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: ohci: pass correct iso xmit timestamps to core firewire: ohci: Make cycleMatch ISO transmission work
Diffstat (limited to 'drivers/input/serio/serport.c')
0 files changed, 0 insertions, 0 deletions