git.alex.org.uk - linux-flexiantxendom0-3.2.10.git/commit

projects / linux-flexiantxendom0-3.2.10.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1a0bdad a7f4255)

author	David S. Miller <davem@davemloft.net>
	Fri, 9 Mar 2012 22:34:20 +0000 (14:34 -0800)
committer	David S. Miller <davem@davemloft.net>
	Fri, 9 Mar 2012 22:34:20 +0000 (14:34 -0800)
commit	b2d3298e0916fa059712691c85a0e97becc4ab9f
tree	c7d5ea46a9dbf9cebdb122df4aaf0beda6e7621e	tree \| snapshot
parent	1a0bdadb4e36abac63b0a9787f372aac30c11a9e	commit \| diff
parent	a7f4255f906f60f72e00aad2fb000939449ff32e	commit \| diff

Merge git://git./linux/kernel/git/davem/net

14 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/caif/caif_hsi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/atheros/atl1c/atl1c_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/tg3.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ibm/ehea/ehea_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/netvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/usbnet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-lib.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_netlink.c	diff1 \|	diff2 \|	blob \| history

Port of xen3.3 xenlinux code to Ubuntu packaged SUSE kernel (3.2.10)