summaryrefslogtreecommitdiff
path: root/arch/arm/boot/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-25 09:11:40 (GMT)
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-25 09:11:40 (GMT)
commit85e63343f49cdf859bb630ba39d9a9af85dfb3e6 (patch)
tree8c72184c38d93a34e08f386ae70b4ee12ed7ac20 /arch/arm/boot/Makefile
parent2f6ae6ef631cd16b0725958ee805a24b9e38d7ad (diff)
parent6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff)
downloadlinux-fsl-qoriq-85e63343f49cdf859bb630ba39d9a9af85dfb3e6.tar.xz
Merge tag 'v3.5-rc4' into regulator-drivers
Linux 3.5-rc4 contains patches which conflict with some of the development work.
Diffstat (limited to 'arch/arm/boot/Makefile')
0 files changed, 0 insertions, 0 deletions