]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'samsung/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 02:10:48 +0000 (13:10 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 02:10:48 +0000 (13:10 +1100)
commitf8d8162527620f0e20acacb36dbed8ace5758ca4
treeee460f3286a5cbdffef47b8ea6257421a5d0d869
parentf1f60babb627610ddd4540ce65a7fe363e9f778b
parent59e65fdb514b774cb4838ac86f07b9d7b7241f11
Merge remote-tracking branch 'samsung/for-next'

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