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

Simple merge