From: Benjamin Herrenschmidt Date: Mon, 28 Jul 2014 03:41:12 +0000 (+1000) Subject: Merge branch 'merge' into next X-Git-Tag: v3.17-rc1~91^2~72 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cdc2652ee581366798a9ac303b5d855ceebea8d9;p=users%2Fjedix%2Flinux-maple.git Merge branch 'merge' into next Bring in some important fixes from the 3.16 branch --- cdc2652ee581366798a9ac303b5d855ceebea8d9