]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 02:17:05 +0000 (13:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 02:17:05 +0000 (13:17 +1100)
commite4e8a523fb1a9bee21d17ebe6bc336030e8ee5f4
treeafde6a1e50df85e29d79900bd5790287fb7460a5
parentfd0079aaa5d36a7d6ef475ddb2955217c3bb7933
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
drivers/mtd/nand/sh_flctl.c