From: David S. Miller <davem@davemloft.net>
Date: Thu, 5 Mar 2009 10:06:47 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.30-rc1~662^2~361
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=508827ff0ac3981d420edac64a70de7f4e304d38;p=pandora-kernel.git

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

Conflicts:
	drivers/net/tokenring/tmspci.c
	drivers/net/ucc_geth_mii.c
---

508827ff0ac3981d420edac64a70de7f4e304d38
Reading git-diff-tree failed