diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-08 09:04:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-08 09:04:55 -0700 |
| commit | c46f87f121f815a67e84379511310e5c03862a60 (patch) | |
| tree | 56c25d0ab7cd45b388810629afb52f8a983d7aa6 /drivers/input/serio/libps2.c | |
| parent | 6025974bab1c3da8662df79bdeb694588bc3eb93 (diff) | |
| parent | 669165daad2ec839df85b8c5f7bc155e76a2f404 (diff) | |
| download | op-kernel-dev-c46f87f121f815a67e84379511310e5c03862a60.zip op-kernel-dev-c46f87f121f815a67e84379511310e5c03862a60.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
pdc202xx_old: fix resetproc() method
pdc202xx_old: fix 'pdc20246_dma_ops'
Diffstat (limited to 'drivers/input/serio/libps2.c')
0 files changed, 0 insertions, 0 deletions
