Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Dec 2011 20:53:32 +0000 (12:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Dec 2011 20:53:32 +0000 (12:53 -0800)
commitabe8809c14f05430f9f8cb13bd70b2ec3195e84b
tree648244835839cdf7573795676a0c52adcab2a8c2
parentb9eda06f80b0db61a73bd87c6b0eb67d8aca55ad
parent19d40dcabf1cdf84e1a76c147b7177b5a6c21943
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.