]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream-linus2' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 3 Jul 2007 04:04:36 +0000 (21:04 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 3 Jul 2007 04:04:36 +0000 (21:04 -0700)
commit6b541ce61bc194944e2a980685abf7e586d8efe9
tree027624143bc17ec70cc30bb745556657f382acb3
parent4f5759634c96768ea53f9342ea505db1b3db8b99
parente96ced658ea041f316c76af295b2066ee48fe6c2
Merge branch 'upstream-linus2' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus2' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] sata_nv: undo merge error