tree 098fbb9b45213feeb5e093a9a690ef76e624469a
parent 0b5c25e8ac3a60bd01a52ca7405ba96aec8c16be
parent 28c8e4790ca5ef75f54895ca46437f9fbb433ddf
author David S. Miller <davem@davemloft.net> 1276581574 -0700
committer David S. Miller <davem@davemloft.net> 1276581574 -0700

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/ixgbe/ixgbe_ethtool.c

With merge conflict help from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>