Kevin Hilman ecdf94da6f
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.
2015-06-11 14:37:45 -07:00
2015-04-28 23:58:54 +02:00
2015-04-21 09:33:10 -07:00
2015-04-15 10:42:15 -07:00
2015-05-12 13:42:46 -04:00
2015-06-11 14:31:55 -07:00
2015-04-07 18:09:20 +02:00
2015-05-29 16:45:45 -07:00
2015-04-21 06:12:35 -03:00
2015-05-27 14:15:26 -04:00
2015-05-05 13:21:27 -04:00
2015-04-01 16:31:26 +01:00
2015-04-27 09:38:06 -07:00
2015-04-30 19:08:06 +02:00
2015-05-30 19:58:11 -07:00
2015-05-28 18:25:18 -07:00
2015-05-16 16:40:22 -04:00
2015-04-20 15:16:25 -07:00
2015-05-19 19:55:36 +01:00
ecdf94da6f