From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue, 22 Jul 2008 07:12:37 +0000 (+1000)
Subject: Merge commit 'origin/master'
X-Git-Tag: v2.6.27-rc1~865^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8725f25acc656c1522d48a6746055099efdaca4c;p=pandora-kernel.git

Merge commit 'origin/master'

Manually fixed up:

	drivers/net/fs_enet/fs_enet-main.c
---

8725f25acc656c1522d48a6746055099efdaca4c
Reading git-diff-tree failed