From: David S. Miller <davem@davemloft.net>
Date: Wed, 19 Nov 2008 07:38:23 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.29-rc1~581^2~684
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=198d6ba4d7f48c94f990f4604f0b3d73925e0ded;p=pandora-kernel.git

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

Conflicts:

	drivers/isdn/i4l/isdn_net.c
	fs/cifs/connect.c
---

198d6ba4d7f48c94f990f4604f0b3d73925e0ded
Reading git-diff-tree failed