Merge tag 'sunxi-core-for-3.12' of https://github.com/mripard/linux into next/soc
authorKevin Hilman <khilman@linaro.org>
Wed, 21 Aug 2013 21:31:33 +0000 (14:31 -0700)
committerKevin Hilman <khilman@linaro.org>
Wed, 21 Aug 2013 21:31:45 +0000 (14:31 -0700)
commitf7b29518c33a0fe48cf13b7e2eb04a5fdb11293d
tree95fbf77fe352b583c628b1c725ed1d40b903e812
parentbfa664f21b0357f2ad9cdf519f594ece36ec8f64
parent29d3d373e2a780b6e818f296ece6cc29742bc11f
Merge tag 'sunxi-core-for-3.12' of https://github.com/mripard/linux into next/soc

Allwinner sunXi core additions for 3.12

There's not much in this pull request, only a patch removing some dead code.

* tag 'sunxi-core-for-3.12' of https://github.com/mripard/linux:
  ARM: sunxi: Remove Makefile.boot file

Signed-off-by: Kevin Hilman <khilman@linaro.org>