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)
commit8174a06eba10a43375d1dd6f74c58a71519e3be5
tree2eb5b0ed96556527483ca0f62eec51b6720030c8
parent09521577ca7718b6c83f095ca4f0d474b01a8378
parentaab9440453d19c1885fa391d4aafd7705f316247
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