]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'samsung/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 12 Oct 2012 03:38:40 +0000 (14:38 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 12 Oct 2012 03:38:40 +0000 (14:38 +1100)
commit7270ea74c4985f8f6719575ddd5509b53214ea29
treea0a9c701c35c9d2659ca509ee0ac4454aea8523a
parentf990515172ce3f821814453eb89f421f3e19a228
parent59e65fdb514b774cb4838ac86f07b9d7b7241f11
Merge remote-tracking branch 'samsung/for-next'

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