]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'samsung/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 02:25:39 +0000 (13:25 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 02:25:39 +0000 (13:25 +1100)
commit3051ae9f34e2c13dcbf366f06f9a4d670d7962b0
tree6c03417bc1748ab065b1812e4fa3686e6f21085b
parent5a819e9ced11f9e3079312a51527e92e5f2bc698
parent59e65fdb514b774cb4838ac86f07b9d7b7241f11
Merge remote-tracking branch 'samsung/for-next'

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