]> 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, 11 Oct 2012 01:39:38 +0000 (12:39 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 01:39:38 +0000 (12:39 +1100)
commit0999ffc46747fca39fb9a34c27475e92e3fcb9fd
treef7281f2e76d7109d0e5c8bc848431c6f4d3c0d51
parent4f47088191e22e5228e660d1054753a7fe60000b
parent59e65fdb514b774cb4838ac86f07b9d7b7241f11
Merge remote-tracking branch 'samsung/for-next'

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