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: 83a4d81 a0f75f9)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 28 Jun 2013 02:25:19 +0000 (12:25 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 28 Jun 2013 02:25:19 +0000 (12:25 +1000)
commit	6f87b6ad6cf13d00186947a7db421eab171f2ac0
tree	bf52121fed4a06b6bbae5c144277ddd25b9f8c34	tree \| snapshot
parent	83a4d81e404a06b1311160d442ab2c37227c5c3d	commit \| diff
parent	a0f75f9d495b3905b4c658c1d813a127f558a350	commit \| diff

Merge remote-tracking branch 'pci/next'

Conflicts:
arch/ia64/sn/kernel/io_init.c
drivers/acpi/pci_root.c
drivers/pci/probe.c
include/linux/aer.h

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/ia64/sn/kernel/io_init.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/apei/ghes.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/pci_root.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/ahci.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/pci/pcie/aer/aerdrv_core.c	diff1 \|	diff2 \|	blob \| history
include/acpi/acpi_bus.h	diff1 \|	diff2 \|	blob \| history
include/linux/aer.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules