Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Sat, 7 Feb 2009 10:52:44 +0000 (02:52 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 7 Feb 2009 10:52:44 +0000 (02:52 -0800)
commit409f0a9014fe24d906ba21aaccff80eb7f7304da
tree8d9a6946d6cf1c5aab72651a193ff860651e5e65
parent593721833d2a3987736467144ad062a709d3a72c
parent0b492fce3d72d982a7981905f85484a1e1ba7fde
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/3c509.c
drivers/net/r8169.c
drivers/net/sungem.c
drivers/net/wireless/iwlwifi/iwl-sta.c
net/core/dev.c