]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'samsung/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 02:52:05 +0000 (13:52 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 02:52:05 +0000 (13:52 +1100)
commit4f8aaf661f674a9ad2a1369d1b1576627ac92f73
tree35086b9122659c1d1aa454fe9069f4552a652df9
parentddced6fc710e8202c306376137590abfd20bbba6
parent59e65fdb514b774cb4838ac86f07b9d7b7241f11
Merge remote-tracking branch 'samsung/for-next'

Conflicts:
arch/arm/mach-exynos/clock-exynos5.c