From: Kevin Hilman <khilman@linaro.org>
Date: Thu, 11 Jun 2015 21:37:45 +0000 (-0700)
Subject: Merge tag 'v4.1-rc6' into next/dt
X-Git-Tag: v4.2-rc1~99^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ecdf94da6f91310d08081e05db78a6c997b44e4b;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'v4.1-rc6' into next/dt

Linux 4.1-rc6

 Conflicts:
	arch/arm/boot/dts/zynq-7000.dtsi

Resolution summary:

 Mainline had an earlier version of the commit, resolve in favor of the
 newer patch in next/dt branch.
---

ecdf94da6f91310d08081e05db78a6c997b44e4b