From: David S. Miller <davem@davemloft.net>
Date: Tue, 17 Nov 2009 08:05:02 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.33-rc1~388^2~330
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2bfbc072e279ff81e6b336acff612b9bc2e5281;p=pandora-kernel.git

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

Conflicts:
	drivers/net/can/Kconfig
---

a2bfbc072e279ff81e6b336acff612b9bc2e5281
Reading git-diff-tree failed