aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-disk.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-09 16:03:19 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-09 16:03:19 -0700
commita7df26da158ad64d56cc32934aa38a07d03a6fc9 (patch)
treebe7cf42be9e84df58332c16db91526f818da020b /drivers/ide/ide-disk.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
parent[IA64] fix nohalt boot option (diff)
downloadlinux-dev-a7df26da158ad64d56cc32934aa38a07d03a6fc9.tar.xz
linux-dev-a7df26da158ad64d56cc32934aa38a07d03a6fc9.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'drivers/ide/ide-disk.c')
0 files changed, 0 insertions, 0 deletions