From: David S. Miller <davem@davemloft.net>
Date: Sat, 14 Jun 2008 03:52:39 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.27-rc1~969^2~326
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ae127d1b6c71f9240dd4245f240e6dd8fc98014;p=pandora-kernel.git

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

Conflicts:

	drivers/net/smc911x.c
---

4ae127d1b6c71f9240dd4245f240e6dd8fc98014
Reading git-diff-tree failed