]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 11 Nov 2008 23:43:02 +0000 (15:43 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 11 Nov 2008 23:43:02 +0000 (15:43 -0800)
commit3eff1af0a822a032e65daeb5608a149a9a7cb951
tree9b0e062d3677d50d731ffd0fba47423bfdee9253
parentb5a871a05436f33cc20108d9b0bf481f852475ea
parentc3249cc19d3b856751d42ba1b2d8cf46ccb24d2e
Merge branch 'master' of master.kernel.org:/pub/scm/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
MAINTAINERS
drivers/message/fusion/mptlan.c
net/core/skbuff.c
net/dsa/slave.c
net/dsa/tag_dsa.c
net/dsa/tag_edsa.c
net/dsa/tag_trailer.c
net/ipv6/ip6mr.c
net/netfilter/ipvs/ip_vs_xmit.c
net/unix/af_unix.c
net/unix/garbage.c