]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 03:37:01 +0000 (13:37 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 03:37:01 +0000 (13:37 +1000)
commit1eaf7af75626e9d58a1b5a5d59969484e20ed502
tree8315042147616a3a7800bfb8c7c31b698bf388ac
parentae95afd04c62329c0f31a377a80737267bf31f90
parent56e9f9d22cfcdd1e617293ec74bf01d4b24c994d
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
drivers/cpufreq/powernow-k8.c
drivers/cpufreq/powernow-k8.c
drivers/pci/pci-driver.c