]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 03:09:07 +0000 (13:09 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 03:09:07 +0000 (13:09 +1000)
1  2 
arch/arm/kernel/smp.c
drivers/pci/pci-driver.c

Simple merge
Simple merge