]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 24 Apr 2007 16:32:07 +0000 (09:32 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 24 Apr 2007 16:32:07 +0000 (09:32 -0700)
commit5817293e9be161cda736c3c7fc162d230ea8830a
treec22b1dc22bdf57c586c1fb86f202353a061a7564
parenta31f0d019c200ea45fb2c8bad06b3bfab856e5f4
parent0bf5fa829145364eb833f467844306856f96abe0
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  Revert "adjust legacy IDE resource setting (v2)"