Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 25 May 2009 08:42:21 +0000 (01:42 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 May 2009 08:42:21 +0000 (01:42 -0700)
commitc649c0e31d5736a4b7c5c3454182091dda4bbe62
tree93da11bf4ea828611ab5277a7dbadf57724c2b1e
parentdaebafed7fef54fcc73d2d01431122cfd578d1e0
parent4e2fd555199977c5994d1a4d2d3b8761b20ca4c7
Merge branch 'master' of /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
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