aboutsummaryrefslogtreecommitdiff
path: root/drivers/ide
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-28 15:12:25 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-28 15:12:25 -0700
commit8f7c58814eb75bf97b8bc18d107b2e26f28b6585 (patch)
treef871b4c546986e257fcecf57fae31426b9f7ef55 /drivers/ide
parent1c952af548012bcf281623dafa2173897bfc6a77 (diff)
parent0a3a6d69b7e9f1d7fa5add7db528e7b81cbd422e (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
* master.kernel.org:/pub/scm/linux/kernel/git/dtor/input: Input: db9 - fix potential buffer overrun Input: atkbd - fix hardware autorepeat Input: wistron - add mapping for Wistron MS 2111
Diffstat (limited to 'drivers/ide')
0 files changed, 0 insertions, 0 deletions