commit | 8174a06eba10a43375d1dd6f74c58a71519e3be5 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Nov 23 17:26:22 2011 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Nov 23 17:26:22 2011 -0800 |
tree | 2eb5b0ed96556527483ca0f62eec51b6720030c8 | |
parent | 09521577ca7718b6c83f095ca4f0d474b01a8378 [diff] | |
parent | aab9440453d19c1885fa391d4aafd7705f316247 [diff] |
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