Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/wireless/ath/ath5k/phy.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c

diff --cc drivers/isdn/gigaset/isocdata.c
Simple merge

diff --cc drivers/net/gianfar.c
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/reset.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-5000.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-scan.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl3945-base.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/ipv4/fib_trie.c
Simple merge

diff --cc net/wireless/reg.c
Simple merge

diff --cc net/wireless/wext.c
Simple merge