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: b94ba15 a63ab61)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 12 Sep 2012 01:25:25 +0000 (11:25 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 12 Sep 2012 01:25:25 +0000 (11:25 +1000)
commit	2a684a7490e00009fa5cbd880afbeb6c0baaf243
tree	9b544e92ae16378c1814cbabfccc9efd717af977	tree \| snapshot
parent	b94ba15280110e5b5d4dc9e9d97e928325f00020	commit \| diff
parent	a63ab613ff48c593f4e9ace2d111978e35a202e4	commit \| diff

Merge remote-tracking branch 'pci/next'

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

15 files changed:

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
arch/powerpc/include/asm/machdep.h	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/pci-common.c	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

Linux kernel for KaRo TX COM modules