tree bde0bf4aff036c6bac19a0212194ae1092afb3c9
parent 68024541e2e5a8f35e281daaa5068a29e2a538a5
parent f6f7b52e2f6149d2ee365717afff315b05720162
author David S. Miller <davem@davemloft.net> 1228276227 -0800
committer David S. Miller <davem@davemloft.net> 1228276227 -0800

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

Conflicts:

	drivers/net/ixgbe/ixgbe_main.c
	drivers/net/smc91x.c