Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 11 Oct 2010 19:30:34 +0000 (12:30 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 11 Oct 2010 19:30:34 +0000 (12:30 -0700)
commitd122179a3c0fdc71b88cb9e3605f372b1651a9ff
tree63a48b333e7565967b6d7c9e246557bfcb9f225f
parent419c20465d6319274e7286f0966e2390540e6e0a
parentb00916b189d13a615ff05c9242201135992fcda3
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
net/core/ethtool.c
drivers/atm/iphase.c
drivers/net/r8169.c
drivers/net/wimax/i2400m/rx.c
net/core/ethtool.c