From: Benjamin Herrenschmidt Date: Mon, 28 Jul 2014 03:41:12 +0000 (+1000) Subject: Merge branch 'merge' into next X-Git-Tag: firefly_0821_release~176^2~3459^2~72 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cdc2652ee581366798a9ac303b5d855ceebea8d9;p=firefly-linux-kernel-4.4.55.git Merge branch 'merge' into next Bring in some important fixes from the 3.16 branch --- cdc2652ee581366798a9ac303b5d855ceebea8d9