avem@davemloft.net> 1237541261 -0700
committer David S. Miller <davem@davemloft.net> 1237541261 -0700

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

Conflicts:
	drivers/net/virtio_net.c
E%y(™Fx