]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Nov 2011 01:26:22 +0000 (17:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Nov 2011 01:26:22 +0000 (17:26 -0800)
commitd293a40a68e53a25a4c421b9bf72f68b32d2110f
tree2eb5b0ed96556527483ca0f62eec51b6720030c8
parent78fd89642020b4a9555d07a8a89ab454c2209c63
parent5a2968dbdc604d729d3b0e36f358b25c88b434c7
Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev

* 'upstream-linus' of git://github.com/jgarzik/libata-dev:
  libata: fix build without BMDMA
  [libata] ahci_platform: fix DT probing