From: David S. Miller <davem@davemloft.net>
Date: Thu, 3 Apr 2008 05:35:23 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.26-rc1~1138^2~229
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a;p=pandora-kernel.git

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

Conflicts:

	drivers/net/s2io.c
---

e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a
Reading git-diff-tree failed