Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Mon, 25 May 2009 08:42:21 +0000 (01:42 -0700)]
Conflicts:
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c

1  2 
drivers/isdn/gigaset/isocdata.c
drivers/net/gianfar.c
drivers/net/wireless/ath/ath5k/reset.c
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
net/core/skbuff.c
net/ipv4/fib_trie.c
net/wireless/reg.c
net/wireless/wext.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge