]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Nov 2012 02:30:10 +0000 (13:30 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Nov 2012 02:30:10 +0000 (13:30 +1100)
commit9252242d3df69566073f3ed9af1ce327017ed8e9
tree7bd688667bf4d709b212cef304b03da05baed371
parent56f5a23b585de809202b76b2710eed59bb18b8c4
parente1424ee4c8bfc6c8af31448d46edb2c2528be82f
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/x86/pci/acpi.c
arch/x86/pci/acpi.c
drivers/acpi/pci_irq.c