From: David S. Miller <davem@davemloft.net>
Date: Thu, 7 Oct 2010 02:39:31 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.37-rc1~147^2~202
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69259abb64d4da77273bf59accfc9fa79e7165f4;p=pandora-kernel.git

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

Conflicts:
	drivers/net/pcmcia/pcnet_cs.c
	net/caif/caif_socket.c
---

69259abb64d4da77273bf59accfc9fa79e7165f4
Reading git-diff-tree failed