]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ux500-core/ux500-core'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Sep 2011 01:47:06 +0000 (11:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Sep 2011 01:47:06 +0000 (11:47 +1000)
1  2 
arch/arm/mach-ux500/board-mop500-pins.c
arch/arm/mach-ux500/board-mop500.c

Simple merge