]> 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, 15 Oct 2012 01:01:09 +0000 (12:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 15 Oct 2012 01:01:09 +0000 (12:01 +1100)
commit572494d2ca73e045a46975df68e892b467281fdb
tree00e6f02843232309eb4e228ef0af6744b3d77895
parent70fbee95206d5c68192b699881d267edb13b71fd
parent59e65fdb514b774cb4838ac86f07b9d7b7241f11
Merge remote-tracking branch 'samsung/for-next'

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