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: 8fa3e2e 131ea66)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 24 Aug 2011 02:43:46 +0000 (12:43 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 24 Aug 2011 02:44:05 +0000 (12:44 +1000)
commit	de2d505f1263dd1d910d9a2d7977033935262bfe
tree	24877add665cf1b186c6eaefd44ecf0fe5fcf3b7	tree \| snapshot
parent	8fa3e2ea0e8c4159f663d475616b99d015f6ea9c	commit \| diff
parent	131ea6675c761f655d43b808dd0fe83d15d5cdd3	commit \| diff

Merge remote-tracking branch 'net/master'

Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
drivers/net/Kconfig
drivers/net/Makefile

18 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/configs/ppc40x_defconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/configs/ppc64_defconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/40x/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/sparc/configs/sparc32_defconfig	diff1 \|	diff2 \|	blob \| history
arch/sparc/configs/sparc64_defconfig	diff1 \|	diff2 \|	blob \| history
drivers/bcma/main.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/cris/eth_v10.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cadence/at91_ether.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl12xx/main.c	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules