]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Sep 2011 01:42:07 +0000 (11:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Sep 2011 01:42:07 +0000 (11:42 +1000)
commit1d0ee9bc7f3c6f88143dd1b6f08f09a2cfd6f996
tree8bcda4acd5157736f1fbd15f17d510afc328b0de
parent9d4c4a0995d7f5b33722b82a47a384d92ff8be26
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