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: 0963392 97ac9d1)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Sep 2012 01:22:42 +0000 (11:22 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Sep 2012 01:22:42 +0000 (11:22 +1000)
commit	0df7a548e1b40027345e589024442314bf9c48c8
tree	56a51935b47750f919425bb1e9f4f5f24004c3b7	tree \| snapshot
parent	09633921a4897419b918cea97f596a9b0dfd0b94	commit \| diff
parent	97ac9d1f363964dec7fbb20cf3c2e88336b4d801	commit \| diff

Merge remote-tracking branch 'pci/next'

Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/rapidio/devices/tsi721.c

14 files changed:

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/powernv/pci-ioda.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/evergreen.c	diff1 \|	diff2 \|	blob \| history
drivers/iommu/intel-iommu.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/e1000e/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/pcie/portdrv_pci.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/probe.c	diff1 \|	diff2 \|	blob \| history
drivers/rapidio/devices/tsi721.c	diff1 \|	diff2 \|	blob \| history
include/linux/efi.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules