Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 30 Apr 2009 03:30:35 +0000 (20:30 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 30 Apr 2009 03:30:35 +0000 (20:30 -0700)
commitaba7453037c3a90714caae77a622dceaf1173786
treebf07f9f432b0d8e9db9486f1f32ad065c0aa7c5c
parenta4fe91ee711f4e955ea85ab05b092cfe384b073e
parent93af7aca44f0e82e67bda10a0fb73d383edcc8bd
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
Documentation/isdn/00-INDEX
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/net/wireless/rndis_wlan.c
net/mac80211/main.c
Documentation/isdn/00-INDEX
drivers/net/ixgbe/ixgbe_common.c
drivers/net/ixgbe/ixgbe_main.c
drivers/net/wireless/ath/ath5k/debug.c
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
include/linux/netdevice.h
net/8021q/vlan_dev.c
net/core/datagram.c
net/mac80211/main.c