From: David S. Miller <davem@davemloft.net>
Date: Wed, 24 Dec 2008 01:56:23 +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~88
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6332178d91ca1a9dbd99bd97cabbcf965d178e9f;p=pandora-kernel.git

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

Conflicts:

	drivers/net/ppp_generic.c
---

6332178d91ca1a9dbd99bd97cabbcf965d178e9f
Reading git-diff-tree failed