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: 9435eb1 2205a6e)

author	David S. Miller <davem@davemloft.net>
	Sun, 20 Feb 2011 03:17:35 +0000 (19:17 -0800)
committer	David S. Miller <davem@davemloft.net>
	Sun, 20 Feb 2011 03:17:35 +0000 (19:17 -0800)
commit	da935c66bacb3ed9ada984b053297f87c2dff63a
tree	46278da2b312c73f1375b830d7e5912bf23abd78	tree \| snapshot
parent	9435eb1cf0b76b323019cebf8d16762a50a12a19	commit \| diff
parent	2205a6ea93fea76f88b43727fea53f3ce3790d6f	commit \| diff

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/e1000e/netdev.c
net/xfrm/xfrm_policy.c

15 files changed:

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-3945.c	diff1 \|	diff2 \|	blob \| history
include/linux/dcbnl.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_private.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/devinet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/ip6t_LOG.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_core.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history

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