From: David S. Miller <davem@davemloft.net>
Date: Fri, 20 Mar 2009 09:27:41 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.30-rc1~662^2~174
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b1c4354de72ced917d2f3fe88117613f992234b;p=pandora-kernel.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/virtio_net.c
---

2b1c4354de72ced917d2f3fe88117613f992234b
Reading git-diff-tree failed