tree 95c566c6238cc953e1e336115d2daafe8bcb388f
parent e59d44df46edaafb6b637e98d046775524b31104
parent 024a07bacf8287a6ddfa83e9d5b951c5e8b4070e
author David S. Miller <davem@davemloft.net> 1275871322 -0700
committer David S. Miller <davem@davemloft.net> 1275871322 -0700

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

Conflicts:
	drivers/net/sfc/net_driver.h
	drivers/net/sfc/siena.c