Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build

Manual fixup of:

	arch/powerpc/Kconfig

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/powerpc/Kconfig
index 06b72771ae22991507d727663343fd0e8b406d86,a5e9912e2d3773fdab23a4bc52ec5e147f47e1cf..1530a41fc56d5daa886be007931d854e3564709c
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -112,8 -111,7 +114,8 @@@ config PP
        select HAVE_KPROBES
        select HAVE_KRETPROBES
        select HAVE_LMB
 +      select HAVE_DMA_ATTRS if PPC64
+       select HAVE_OPROFILE
  
  config EARLY_PRINTK
        bool

diff --cc arch/powerpc/kernel/Makefile
Simple merge

diff --cc arch/powerpc/kernel/entry_32.S
Simple merge

diff --cc arch/powerpc/kernel/entry_64.S
Simple merge

diff --cc arch/powerpc/kernel/irq.c
Simple merge

diff --cc arch/powerpc/kernel/ppc_ksyms.c
Simple merge

diff --cc arch/powerpc/kernel/setup_32.c
Simple merge

diff --cc arch/powerpc/kernel/vmlinux.lds.S
Simple merge

diff --cc drivers/char/Makefile
Simple merge

diff --cc drivers/char/viotape.c
Simple merge

diff --cc drivers/macintosh/adb.c
Simple merge

diff --cc drivers/macintosh/smu.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/pcmcia/m8xx_pcmcia.c
index 9c5be9a2f3fd5796b0e9f6c2b341cfbdc8edd706,13a5fbd50a078fe3d45c2c1028066e679fe7c581..ff66604e90d4d7620fe58af4c28dec12ae874be2
--- 1/drivers/pcmcia/m8xx_pcmcia.c
--- 2/drivers/pcmcia/m8xx_pcmcia.c
+++ b/drivers/pcmcia/m8xx_pcmcia.c
@@@ -59,8 -57,9 +59,7 @@@
  #include <asm/8xx_immap.h>
  #include <asm/irq.h>
  #include <asm/fs_pd.h>
 -#include <asm/of_device.h>
 -#include <asm/of_platform.h>
  
- #include <pcmcia/version.h>
  #include <pcmcia/cs_types.h>
  #include <pcmcia/cs.h>
  #include <pcmcia/ss.h>

diff --cc include/linux/mm.h
Simple merge

diff --cc mm/mprotect.c
Simple merge