]> 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>
Mon, 26 May 2008 06:26:10 +0000 (23:26 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 26 May 2008 06:26:10 +0000 (23:26 -0700)
commit63d80eb65401d84887186a2224537e523497267d
tree176edb26aad2d33e8be36530b66b19d0603c4b1d
parenta61e58c8e05b206f3ada9e984fca2cf6472eee29
parentdfdaf195277267724da54e20cb49224456d1b152
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/cpmac.c
net/mac80211/mlme.c
16 files changed:
drivers/net/dm9000.c
drivers/net/pcnet32.c
drivers/net/s2io.c
drivers/net/s2io.h
drivers/net/sb1250-mac.c
drivers/net/sky2.c
drivers/net/tokenring/3c359.h
drivers/net/wireless/airo.c
drivers/net/wireless/libertas/main.c
drivers/net/wireless/rtl8187_dev.c
include/net/mac80211.h
net/ipv4/ip_gre.c
net/ipv4/ipip.c
net/ipv6/sit.c
net/mac80211/mlme.c
net/mac80211/wext.c