| commit | abe8809c14f05430f9f8cb13bd70b2ec3195e84b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 22 12:53:32 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 22 12:53:32 2011 -0800 |
| tree | 648244835839cdf7573795676a0c52adcab2a8c2 | |
| parent | b9eda06f80b0db61a73bd87c6b0eb67d8aca55ad [diff] | |
| parent | 19d40dcabf1cdf84e1a76c147b7177b5a6c21943 [diff] |
Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev * 'upstream-linus' of git://github.com/jgarzik/libata-dev: pata_of_platform: Add missing CONFIG_OF_IRQ dependency.