Merge remote-tracking branch 'robh/for-next' into devicetree/next
authorGrant Likely <grant.likely@linaro.org>
Mon, 31 Mar 2014 07:10:55 +0000 (08:10 +0100)
committerGrant Likely <grant.likely@linaro.org>
Mon, 31 Mar 2014 07:10:55 +0000 (08:10 +0100)
1  2 
Makefile
arch/arm/Kconfig

diff --cc Makefile
Simple merge
Simple merge