From: David S. Miller <davem@davemloft.net>
Date: Tue, 16 Dec 2008 23:23:54 +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~161
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=354ade9058687fdef8a612c7b298d4c51dae3da7;p=pandora-kernel.git

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

Conflicts:

	drivers/net/enc28j60.c
---

354ade9058687fdef8a612c7b298d4c51dae3da7
Reading git-diff-tree failed