]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Aug 2011 01:04:59 +0000 (11:04 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Aug 2011 01:04:59 +0000 (11:04 +1000)
1  2 
arch/arm/mach-shmobile/setup-sh7372.c

Simple merge