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: 3b6c1c3 6977a79)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 30 Nov 2011 01:54:39 +0000 (12:54 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 30 Nov 2011 01:54:39 +0000 (12:54 +1100)
commit	f82e6e378ca72b624e84011645ca9c7988432fce
tree	1bb989c2285caa1e59a50189b5ead063b703f9ab	tree \| snapshot
parent	3b6c1c3c5fea12cd997fc42cf611e59f46803f7a	commit \| diff
parent	6977a79d36baf8b295b1893621874202e1d02094	commit \| diff

Merge remote-tracking branch 'net-next/master'

18 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/addr.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/davicom/dm9000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/jme.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/micrel/ks8842.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/virtio/virtio_mmio.c	diff1 \|	diff2 \|	blob \| history
drivers/virtio/virtio_pci.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/linux/virtio_config.h	diff1 \|	diff2 \|	blob \| history
include/net/inetpeer.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ipv6_sockglue.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/agg-tx.c	diff1 \|	diff2 \|	blob \| history
net/netlabel/netlabel_kapi.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules