Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 25 Feb 2009 08:02:05 +0000 (00:02 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 25 Feb 2009 08:02:05 +0000 (00:02 -0800)
commitf11c179eea77b8afc2fb7cb4b9a8815b85e3c16f
tree9edf1e86fbb91815f31d7728820d098041f03bb9
parent4545a3f2765bb7d2d93468a8ffa578ac87a2c5c7
parent0c9a3aaaf30e1d1994de58c554ef97a719e20892
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/wireless/orinoco/orinoco.c
drivers/net/wireless/ath9k/main.c
drivers/net/wireless/orinoco/main.c
drivers/net/wireless/rtl818x/rtl8187_dev.c