]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Sep 2008 15:05:55 +0000 (08:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Sep 2008 15:05:55 +0000 (08:05 -0700)
commitdd610286ff561f3a3dd28f87f09ed717db41f60a
treec4a78e3b79a1bf3e097d0f738f3012d21e9fa5c2
parentf3d2c71ddc33eb776cc23519a6b98b7b321ae58e
parentdb71303497598de1dd00010700a7e97d43fdd63c
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  sata_nv: reinstate nv_hardreset() for non generic controllers