]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'samsung/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 27 Sep 2012 06:03:40 +0000 (16:03 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 27 Sep 2012 06:03:44 +0000 (16:03 +1000)
commita3ccb61d8bb3def312576979d215b6018687199a
tree9424278cb1cb6089c36b37188c3ca74298c9a837
parent15035f0315fe4d407a43f19075705eeec11abcc1
parent59e65fdb514b774cb4838ac86f07b9d7b7241f11
Merge remote-tracking branch 'samsung/for-next'

Conflicts:
arch/arm/mach-exynos/Makefile.boot
arch/arm/boot/dts/Makefile
arch/arm/mach-exynos/mach-exynos5-dt.c