git.stricted.de - GitHub/exynos8895/android_kernel_samsung_universal8895.git/commit

projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3ac38c3 f21f237)

author	David S. Miller <davem@davemloft.net>
	Tue, 11 Nov 2008 23:43:02 +0000 (15:43 -0800)
committer	David S. Miller <davem@davemloft.net>
	Tue, 11 Nov 2008 23:43:02 +0000 (15:43 -0800)
commit	7e452baf6b96b5aeba097afd91501d33d390cc97
tree	9b0e062d3677d50d731ffd0fba47423bfdee9253	tree \| snapshot (tar.gz zip)
parent	3ac38c3a2e7dac3f8f35a56eb85c27881a4c3833	commit \| diff
parent	f21f237cf55494c3a4209de323281a3b0528da10	commit \| diff

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

Conflicts:

drivers/message/fusion/mptlan.c
drivers/net/sfc/ethtool.c
net/mac80211/debugfs_sta.c

12 files changed:

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/message/fusion/mptlan.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/dsa/slave.c	diff1 \|	diff2 \|	blob \| history
net/dsa/tag_dsa.c	diff1 \|	diff2 \|	blob \| history
net/dsa/tag_edsa.c	diff1 \|	diff2 \|	blob \| history
net/dsa/tag_trailer.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6mr.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_xmit.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history
net/unix/garbage.c	diff1 \|	diff2 \|	blob \| history