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: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8725f25acc656c1522d48a6746055099efdaca4c;p=linux-2.6

Merge commit 'origin/master'

Manually fixed up:

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

8725f25acc656c1522d48a6746055099efdaca4c
diff --cc drivers/net/fs_enet/fs_enet-main.c
index ac2c48741d,445763e564..92591384af
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@@ -36,7 -36,6 +36,8 @@@
  #include <linux/fs.h>
  #include <linux/platform_device.h>
  #include <linux/phy.h>
 +#include <linux/of_platform.h>
++#include <linux/of_gpio.h>
  
  #include <linux/vmalloc.h>
  #include <asm/pgtable.h>