Merge commit 'origin/master'
Benjamin Herrenschmidt [Tue, 22 Jul 2008 07:12:37 +0000 (17:12 +1000)]
Manually fixed up:

drivers/net/fs_enet/fs_enet-main.c

1  2 
Documentation/powerpc/booting-without-of.txt
drivers/net/fs_enet/fs_enet-main.c
drivers/net/gianfar.c
drivers/net/gianfar.h

@@@ -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>
Simple merge
Simple merge