From: David S. Miller <davem@davemloft.net>
Date: Mon, 23 Mar 2009 20:35:04 +0000 (-0700)
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~54
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8be7cdccacfbfc707e7370cad9bb168defed636f;p=pandora-kernel.git

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

Conflicts:
	drivers/net/ucc_geth.c
---

8be7cdccacfbfc707e7370cad9bb168defed636f
Reading git-diff-tree failed