]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitd5c23c2024567c7b1b421b4e35532f1d0a2ca190
tree648244835839cdf7573795676a0c52adcab2a8c2
parent6cde66d5b77fd93d173fb07621b0184083e590a0
parentdcd905611197ed42622d5eb1923da9a3ead4bf2b
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.