]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'suspend/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 02:09:50 +0000 (12:09 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 02:09:50 +0000 (12:09 +1000)
1  2 
arch/arm/mach-shmobile/setup-sh7372.c

Simple merge