Merge branch '2.6.32' into new_master

diff --cc arch/microblaze/configs/mmu_defconfig
index a5b66bef12c508a84ad59d803c0ef37cb7611417,bb7c374713adb7ddd40f0384e34ad305b5ad14dc..34abbc64065b8498e5e15795029fcaa2296ab875
--- 1/arch/microblaze/configs/mmu_defconfig
--- 2/arch/microblaze/configs/mmu_defconfig
+++ b/arch/microblaze/configs/mmu_defconfig
@@@ -361,18 -359,10 +363,14 @@@ CONFIG_NET_ETHERNET=
  # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
  # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
  # CONFIG_KS8842 is not set
- # CONFIG_B44 is not set
  CONFIG_XILINX_EMACLITE=y
  CONFIG_NETDEV_1000=y
 +CONFIG_XILINX_LLTEMAC=y
 +# CONFIG_XILINX_LLTEMAC_MARVELL_88E1111_RGMII is not set
 +CONFIG_XILINX_LLTEMAC_MARVELL_88E1111_GMII=y
 +# CONFIG_XILINX_LLTEMAC_MARVELL_88E1111_MII is not set
  CONFIG_NETDEV_10000=y
- 
- #
- # Wireless LAN
- #
+ CONFIG_WLAN=y
  # CONFIG_WLAN_PRE80211 is not set
  # CONFIG_WLAN_80211 is not set
  

diff --cc arch/microblaze/mm/init.c
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

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

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

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

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

diff --cc arch/powerpc/platforms/44x/Kconfig
Simple merge

diff --cc drivers/Makefile
Simple merge

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

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

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

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 ea33345cff78601f1e937168b81bc5b03c184d73,83a044dbd1d775dc9a3c88d39c2091c42b01ff36..83a044dbd1d775dc9a3c88d39c2091c42b01ff36
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/usb/host/Kconfig
Simple merge

diff --cc drivers/usb/host/ehci-hcd.c
Simple merge

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

diff --cc drivers/video/console/Makefile
index af4d964605f1120abfb534984c50f3b3450d4cf9,a862e9173ebed67d67cac954a98eb70a9f94c346..d3a5abe1d324dcfc1bfc65c1c064e40a193c216b
--- 1/drivers/video/console/Makefile
--- 2/drivers/video/console/Makefile
+++ b/drivers/video/console/Makefile
@@@ -22,10 -22,8 +22,9 @@@ font-objs += $(font-objs-y
  
  obj-$(CONFIG_DUMMY_CONSOLE)       += dummycon.o
  obj-$(CONFIG_SGI_NEWPORT_CONSOLE) += newport_con.o font.o
- obj-$(CONFIG_PROM_CONSOLE)        += promcon.o promcon_tbl.o
  obj-$(CONFIG_STI_CONSOLE)         += sticon.o sticore.o font.o
  obj-$(CONFIG_VGA_CONSOLE)         += vgacon.o
 +obj-$(CONFIG_XILINX_CONSOLE)      += xilcon.o
  obj-$(CONFIG_MDA_CONSOLE)         += mdacon.o
  obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += fbcon.o bitblit.o font.o softcursor.o
  ifeq ($(CONFIG_FB_TILEBLITTING),y)

diff --cc mm/nommu.c
Simple merge

diff --cc usr/.gitignore
index 8d6eb650e5104aecdf68d4eeba5c18341b209b41,8e48117a3f3dc763a0d18f69db0a23f9acafe632..0cf6b17d422beff21c208e8e5c2f86e9ebff7b2c
--- 1/usr/.gitignore
--- 2/usr/.gitignore
+++ b/usr/.gitignore
@@@ -4,7 -4,7 +4,9 @@@
  gen_init_cpio
  initramfs_data.cpio
  initramfs_data.cpio.gz
+ initramfs_data.cpio.bz2
+ initramfs_data.cpio.lzma
  initramfs_list
  include
 +initramfs_data.S
 +bin2asm

diff --cc usr/gen_init_cpio.c
Simple merge