tree 2eb5b0ed96556527483ca0f62eec51b6720030c8
parent 09521577ca7718b6c83f095ca4f0d474b01a8378
parent aab9440453d19c1885fa391d4aafd7705f316247
author Linus Torvalds <torvalds@linux-foundation.org> 1322097982 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1322097982 -0800

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