From: Benjamin Herrenschmidt Date: Mon, 14 May 2012 00:19:22 +0000 (+1000) Subject: Merge branch 'merge' into next X-Git-Tag: firefly_0821_release~3680^2~2810^2~22 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8b6ee04067310a6397476f05f06e52dabd8b0bb6;p=firefly-linux-kernel-4.4.55.git Merge branch 'merge' into next We want the irq fixes from the "merge" branch. --- 8b6ee04067310a6397476f05f06e52dabd8b0bb6