git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c8d657e 018ba0a)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 20 Feb 2013 01:12:45 +0000 (12:12 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 20 Feb 2013 01:12:45 +0000 (12:12 +1100)
commit	5157494d2a54f112cae766412fceae5938d4c9e3
tree	8cf5fe67d93b1d218d3d1afba429d5b6d332937e	tree \| snapshot
parent	c8d657e854da7d8e85926af2c0b8c88543aaa731	commit \| diff
parent	018ba0a6efada61b9bc17500101d81c3d35807c2	commit \| diff

Merge remote-tracking branch 'pci/next'

Conflicts:
arch/ia64/pci/pci.c

18 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
arch/frv/mb93090-mb00/pci-vdk.c	diff1 \|	diff2 \|	blob \| history
arch/ia64/pci/pci.c	diff1 \|	diff2 \|	blob \| history
arch/mn10300/unit-asb2305/pci.c	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/pci_x86.h	diff1 \|	diff2 \|	blob \| history
arch/x86/pci/acpi.c	diff1 \|	diff2 \|	blob \| history
arch/x86/pci/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/pci/legacy.c	diff1 \|	diff2 \|	blob \| history
arch/x86/pci/numaq_32.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/acpi_memhotplug.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/device_pm.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/glue.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/osl.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/hotplug/pciehp_core.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/iov.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/pcie/aspm.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/remove.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules