]> git.hungrycats.org Git - linux/commit
Merge bk://bart.bkbits.net/ide-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 20 Oct 2004 10:08:10 +0000 (03:08 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 20 Oct 2004 10:08:10 +0000 (03:08 -0700)
commit945fb65525341d8af53566a306253294a292ab79
treeca38b9ab31efb5604c58544d8fa1bbbe16571a99
parenta9ce970684c1365b6bc9a46e8fb35ccfe1a9928f
parent01b81c2d5b185e19e828c53d284fe5c1b1fb8232
Merge bk://bart.bkbits.net/ide-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
drivers/ide/ide-taskfile.c
drivers/ide/ide.c