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)
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>

Trivial merge