Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 2 Mar 2009 05:35:16 +0000 (21:35 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 2 Mar 2009 05:35:16 +0000 (21:35 -0800)
commitaa4abc9bcce0d2a7ec189e897f8f8c58ca04643b
tree22ef88d84a2e06380bb6a853c3ba28657e4e5f92
parent814c01dc7c533033b4e99981a2e24a6195bfb43c
parent52c0326beaa3cb0049d0f1c51c6ad5d4a04e4430
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/wireless/iwlwifi/iwl-tx.c
net/8021q/vlan_core.c
net/core/dev.c
drivers/net/b44.c
drivers/net/gianfar.c
drivers/net/r8169.c
drivers/net/wireless/libertas/main.c
drivers/net/wireless/libertas/scan.c
fs/compat_ioctl.c
net/8021q/vlan_core.c
net/core/dev.c