]> 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>
Fri, 8 May 2009 09:48:30 +0000 (02:48 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 8 May 2009 09:48:30 +0000 (02:48 -0700)
commitb39abb6949d98d92530900440b6afd0d209e36aa
tree281a7d476f256ea3e2f800177ba685b169cc0540
parent03bbadcf2a1a200fab680d3e82c3cf18dadd0e4f
parent5e23af2aadf5ac9e55b862cb40f55aef35cbfcab
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
include/net/tcp.h
12 files changed:
drivers/net/e1000/e1000_main.c
drivers/net/ehea/ehea_main.c
drivers/net/igb/igb_main.c
drivers/net/usb/Kconfig
drivers/net/usb/Makefile
drivers/net/wireless/iwlwifi/iwl-sta.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
include/net/tcp.h
net/ipv4/tcp_input.c
net/mac80211/tx.c
net/wireless/reg.c
net/wireless/scan.c