]> 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>
Tue, 17 Feb 2009 22:16:02 +0000 (14:16 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Feb 2009 22:16:02 +0000 (14:16 -0800)
commit648eb8e6b2d8a7b3ae67e04165931ac907934811
tree13ff343e916e925deed298ca4abd1a73fd95c50b
parentc8058a1935a47f08a52cb075a1459aab053f97d6
parentbab7c95d195586a3135b12e20295ded479f956ff
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: give up hardreset on nf2
  libata-sff: fix 32-bit PIO ATAPI regression