From: Linus Torvalds Date: Thu, 22 Dec 2011 20:53:32 +0000 (-0800) Subject: Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=abe8809c14f05430f9f8cb13bd70b2ec3195e84b;p=openwrt%2Fstaging%2Fblogic.git 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. --- abe8809c14f05430f9f8cb13bd70b2ec3195e84b