Merge commit 'origin/master'

Manually fixed up:

	drivers/net/fs_enet/fs_enet-main.c

diff --cc Documentation/powerpc/booting-without-of.txt
Simple merge

diff --cc drivers/net/fs_enet/fs_enet-main.c
index ac2c48741d04feadd875dde456ef33daedc26c68,445763e5648eef9951e4858762fc9872daeeace2..92591384afa5550bc592a2bcb03e3002642dc422
--- 1/drivers/net/fs_enet/fs_enet-main.c
--- 2/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>

diff --cc drivers/net/gianfar.c
Simple merge

diff --cc drivers/net/gianfar.h
Simple merge