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: 12ef41d 7bf79d8)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 7 Sep 2012 01:46:56 +0000 (11:46 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 7 Sep 2012 01:46:56 +0000 (11:46 +1000)
commit	727820ae98dc22d727de7303b44e7164a73dc6ec
tree	4fb29a8cbddbc0bdb0ee829ed23e2aaebf94f2d7	tree \| snapshot
parent	12ef41d414704fe3fa93bad43bb4f33d578120af	commit \| diff
parent	7bf79d8a9904ee1ed354e7e655f8045afda67fd6	commit \| diff

Merge remote-tracking branch 'pci/next'

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

12 files changed:

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

Linux kernel for KaRo TX COM modules