summaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/generic.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-18 23:58:21 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-18 23:58:21 +0200
commit5fdf193b15a08f6c32ca4eb5913fa9be788e790e (patch)
tree0747ab5547556b7955de7bf8fcfd0fab542e790d /drivers/ide/pci/generic.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
parent[PATCH] DM9000 - incorrect ioctl() handling (diff)
downloadlinux-5fdf193b15a08f6c32ca4eb5913fa9be788e790e.tar.xz
linux-5fdf193b15a08f6c32ca4eb5913fa9be788e790e.zip
Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/ide/pci/generic.c')
0 files changed, 0 insertions, 0 deletions