]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 01:48:20 +0000 (12:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 01:48:20 +0000 (12:48 +1100)
commitb650ec3cc4666e4ea1098afdd5ccc3fc81fe6f18
tree0353bf1f3c3033e8b4a96f5a8023a85f35258484
parent65a55ea2e2436e9a938065bdd2fa849000dbd710
parentea9c8e21543717b7f42d9ef3c807b7228a173ccd
Merge remote-tracking branch 'pm/linux-next'

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