From: David S. Miller <davem@davemloft.net>
Date: Mon, 9 Nov 2009 07:00:54 +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~450
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4;p=pandora-kernel.git

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

Conflicts:
	drivers/net/can/usb/ems_usb.c
---

d0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4
Reading git-diff-tree failed