From: David S. Miller <davem@davemloft.net>
Date: Wed, 14 Apr 2010 12:01:33 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.35-rc1~473^2~468
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dad1e54b121d93ed47690d77736af63d3f11d657;p=pandora-kernel.git

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

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

dad1e54b121d93ed47690d77736af63d3f11d657
Reading git-diff-tree failed