Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 14 Aug 2009 02:59:44 +0000 (19:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 14 Aug 2009 02:59:44 +0000 (19:59 -0700)
commit5c16807d3d196203d2d3c9fae51ac7e422091904
tree850c33533f80fe426b477c4660c61ba22315a808
parente5e2a8fd8358d1b3a2c51c3248edee72e4194703
parent232e7d68d50c9ac3a55d716e5ae215ecd1e043b9
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/netxen/netxen_nic_main.c
drivers/net/8139cp.c
drivers/net/ixgbe/ixgbe_ethtool.c
drivers/net/netxen/netxen_nic.h
drivers/net/netxen/netxen_nic_init.c
drivers/net/netxen/netxen_nic_main.c