]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 00:13:40 +0000 (10:13 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 00:13:40 +0000 (10:13 +1000)
commitd8ffd201c26b829ff1c6ff301fff86b8d169253e
tree7dcb6b212442873f9c9e28c9cdb9aef639c81b8f
parentf322ca50cd157e61c7084ca92d6c07da172e3b7a
parent30cca64dadab471d194eaaf166d526e48be703cf
Merge remote-tracking branch 'arm/for-next'

Conflicts:
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-s3c64xx/mach-smdk6410.c