]> 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, 28 Jun 2013 06:09:28 +0000 (16:09 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 06:09:28 +0000 (16:09 +1000)
commit5fb347c142020cdaa620b3fde1c23a9c1a1332b5
treef62f9ff7e7c1d92ca6abdd447c124eda8cfb6829
parent33a08966f36323b116d69d525d7a5bacc407e0f5
parent65ef7e0b4dec89744dc6f40c024c508754f9e685
Merge remote-tracking branch 'samsung/for-next'

Conflicts:
arch/arm/Kconfig