]> pilppa.com Git - linux-2.6-omap-h63xx.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)
commitc1fa238762ad2518ab6003983c16508470be6d81
tree027624143bc17ec70cc30bb745556657f382acb3
parentb59449bea276793b8f228ea07bcb861670d79d75
parent531e3a61f55261bf466d0415c48999511334933c
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