tree 652199eacee32c2cf317f5a54da8265973d29978
parent c477d0447db08068a497e7beb892b2b2a7bff64b
parent 3a3dfb062c2e086c202d34f09ce29634515ad256
author David S. Miller <davem@davemloft.net> 1280812966 -0700
committer David S. Miller <davem@davemloft.net> 1280812966 -0700

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

Conflicts:
	drivers/net/e1000e/hw.h
	net/bridge/br_device.c
	net/bridge/br_input.c