Merge branch 'master-2.6.34' of ../../../linux_ppc/linux-2.6 into master-2.6.34

Resolved Conflicts:
	arch/microblaze/Kconfig
	arch/microblaze/configs/mmu_defconfig
	arch/microblaze/include/asm/io.h
	arch/microblaze/include/asm/pci-bridge.h
	arch/microblaze/include/asm/pci.h
	arch/microblaze/include/asm/pgalloc.h
	arch/microblaze/include/asm/prom.h
	arch/microblaze/include/asm/tlbflush.h
	arch/microblaze/kernel/cpu/cache.c
	arch/microblaze/kernel/dma.c
	arch/microblaze/kernel/entry.S
	arch/microblaze/kernel/head.S
	arch/microblaze/mm/consistent.c
	arch/microblaze/mm/init.c
	arch/microblaze/pci/pci-common.c
	arch/microblaze/pci/pci_32.c
	arch/microblaze/pci/xilinx_pci.c
	drivers/input/keyboard/Makefile
	drivers/spi/xilinx_spi.c

diff --cc arch/microblaze/configs/mmu_defconfig
index 9b41c844e09730c500e75d1861749917677650ef,3c91cf6192c6a1603019d8477eeb14113611995e..99ab0e84f75440d9f652a23de00b58ea4f3458e8
--- 1/arch/microblaze/configs/mmu_defconfig
--- 2/arch/microblaze/configs/mmu_defconfig
+++ b/arch/microblaze/configs/mmu_defconfig
@@@ -509,12 -540,8 +547,13 @@@ CONFIG_USB_ARCH_HAS_EHCI=
  # CONFIG_NEW_LEDS is not set
  # CONFIG_ACCESSIBILITY is not set
  # CONFIG_RTC_CLASS is not set
+ # CONFIG_DMADEVICES is not set
  # CONFIG_AUXDISPLAY is not set
 +CONFIG_XILINX_EDK=y
 +# CONFIG_XILINX_LLDMA_USE_DCR is not set
 +CONFIG_XILINX_DRIVERS=y
 +CONFIG_NEED_XILINX_LLDMA=y
 +CONFIG_NEED_XILINX_IPIF=y
  # CONFIG_UIO is not set
  
  #

diff --cc arch/microblaze/include/asm/pgtable.h
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

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

diff --cc drivers/Kconfig
Simple merge

diff --cc drivers/Makefile
index 2ea1c955878d817e736770560f5de32bff5f92ff,f42a03029b7c01d58193ee4b4b63d2660852a46c..a612740ed4d713f9aa772c1f753d0adc60b62697
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -98,8 -99,8 +99,9 @@@ obj-$(CONFIG_INFINIBAND)      += infiniband
  obj-$(CONFIG_SGI_SN)          += sn/
  obj-y                         += firmware/
  obj-$(CONFIG_CRYPTO)          += crypto/
 +obj-$(CONFIG_XILINX_EDK)      += xilinx_common/
  obj-$(CONFIG_SUPERH)          += sh/
+ obj-$(CONFIG_ARCH_SHMOBILE)   += sh/
  obj-$(CONFIG_GENERIC_TIME)    += clocksource/
  obj-$(CONFIG_DMA_ENGINE)      += dma/
  obj-$(CONFIG_DCA)             += dca/

diff --cc drivers/input/keyboard/Kconfig
Simple merge

diff --cc drivers/input/keyboard/Makefile
index 5efb4f8d0acede5e0075ef30b9798161b66e9203,706c6b5ed5f44a7f9c95973503c073a3081e97b4..5fbc5e97275dcae8d3e84b9e2b4dc5d1c6e7c8bd
--- 1/drivers/input/keyboard/Makefile
--- 2/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@@ -17,7 -17,7 +17,8 @@@ obj-$(CONFIG_KEYBOARD_EP93XX)         += ep93x
  obj-$(CONFIG_KEYBOARD_GPIO)           += gpio_keys.o
  obj-$(CONFIG_KEYBOARD_HIL)            += hil_kbd.o
  obj-$(CONFIG_KEYBOARD_HIL_OLD)                += hilkbd.o
 +obj-$(CONFIG_KEYBOARD_XILINX_FSL_PS2_AT)+= xil_fsl_ps2_kbd.o
+ obj-$(CONFIG_KEYBOARD_IMX)            += imx_keypad.o
  obj-$(CONFIG_KEYBOARD_HP6XX)          += jornada680_kbd.o
  obj-$(CONFIG_KEYBOARD_HP7XX)          += jornada720_kbd.o
  obj-$(CONFIG_KEYBOARD_LKKBD)          += lkkbd.o

diff --cc drivers/input/serio/xilinx_ps2.c
index ebb22f88c8426bdd3cebff9e2f822d0b7412ade7,f84f8e32e3f1789fac1655752eeb051b3139cb93..f84f8e32e3f1789fac1655752eeb051b3139cb93
mode 100755,100644..100755
--- 1/drivers/input/serio/xilinx_ps2.c
--- 2/drivers/input/serio/xilinx_ps2.c
+++ b/drivers/input/serio/xilinx_ps2.c

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/mtd/maps/Kconfig
Simple merge

diff --cc drivers/mtd/maps/Makefile
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/Makefile
Simple merge

diff --cc drivers/net/xilinx_emaclite.c
index 1a74594224b1b8303c74b4247b444cf251e58119,1e783ccc306ebe7866de609f2df0c4ff5a277ca3..1e783ccc306ebe7866de609f2df0c4ff5a277ca3
mode 100755,100644..100755
--- 1/drivers/net/xilinx_emaclite.c
--- 2/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c

diff --cc drivers/spi/xilinx_spi.c
Simple merge

diff --cc drivers/usb/host/ehci-xilinx-of.c
index a5861531ad3e052f596caf6d79c178ace0238b53,f603bb2c0a8eedba86bbbad4370e154e1b9c7b0c..f603bb2c0a8eedba86bbbad4370e154e1b9c7b0c
mode 100755,100644..100755
--- 1/drivers/usb/host/ehci-xilinx-of.c
--- 2/drivers/usb/host/ehci-xilinx-of.c
+++ b/drivers/usb/host/ehci-xilinx-of.c

diff --cc drivers/video/console/Kconfig
Simple merge

diff --cc include/asm-generic/dma-mapping-common.h
Simple merge