]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'arm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 11 Oct 2011 01:04:57 +0000 (12:04 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 11 Oct 2011 01:04:57 +0000 (12:04 +1100)
1  2 
arch/arm/mach-omap2/board-2430sdp.c

Simple merge