Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 23 Mar 2009 20:35:04 +0000 (13:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 23 Mar 2009 20:35:04 +0000 (13:35 -0700)
commit8be7cdccacfbfc707e7370cad9bb168defed636f
tree8416607b62ec352176c81afd6f4e7b571ceb957f
parentecd4137320b59759bbe57eef89040ee3e5e66039
parent61fa9dcf9329cb92c220f7b656410fbe5e72f933
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/ucc_geth.c
drivers/net/Kconfig
drivers/net/dnet.c
drivers/net/sungem.c
drivers/net/ucc_geth.c
drivers/net/ucc_geth.h
net/wireless/nl80211.c