Merge branch 'origin' into devel

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c

diff --cc Documentation/kernel-parameters.txt
index ef9827f7c84efffbf5f2c8ef1ef4f01720287b48,fa4e1239a8fa308b69c57995b575e347ca0530eb..6dda1cc3fbafe6b43f4adb914537bc597d72b390
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -829,13 -832,10 +832,16 @@@ and is between 256 and 4096 characters
  
        hvc_iucv=       [S390] Number of z/VM IUCV hypervisor console (HVC)
                               terminal devices. Valid values: 0..8
+       hvc_iucv_allow= [S390] Comma-separated list of z/VM user IDs.
+                              If specified, z/VM IUCV HVC accepts connections
+                              from listed z/VM user IDs only.
  
 +      i2c_bus=        [HW] Override the default board specific I2C bus speed
 +                           or register an additional I2C bus that is not
 +                           registered from board initialization code.
 +                           Format:
 +                           <bus_id>,<clkrate>
 +
        i8042.debug     [HW] Toggle i8042 debug mode
        i8042.direct    [HW] Put keyboard port into non-translated mode
        i8042.dumbkbd   [HW] Pretend that controller can only read data from

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-kirkwood/common.c
Simple merge

diff --cc arch/arm/mach-kirkwood/rd88f6281-setup.c
index c3deea5e3cadb2b6f870324bb6a6f6e242d64e46,e1c0516c4df376cff50a40cf310be2cfb69d563e..31e996d65fc46523845420eac063a29fcacaef40
--- 1/arch/arm/mach-kirkwood/rd88f6281-setup.c
--- 2/arch/arm/mach-kirkwood/rd88f6281-setup.c
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c
@@@ -114,15 -110,15 +119,15 @@@ static void __init rd88f6281_init(void
        kirkwood_ge00_init(&rd88f6281_ge00_data);
        kirkwood_pcie_id(&dev, &rev);
        if (rev == MV88F6281_REV_A0) {
-               rd88f6281_switch_data.sw_addr = 10;
+               rd88f6281_switch_chip_data.sw_addr = 10;
                kirkwood_ge01_init(&rd88f6281_ge01_data);
        } else {
-               rd88f6281_switch_data.port_names[4] = "wan";
+               rd88f6281_switch_chip_data.port_names[4] = "wan";
        }
-       kirkwood_ge00_switch_init(&rd88f6281_switch_data, NO_IRQ);
+       kirkwood_ge00_switch_init(&rd88f6281_switch_plat_data, NO_IRQ);
  
 -      kirkwood_rtc_init();
        kirkwood_sata_init(&rd88f6281_sata_data);
 +      kirkwood_sdio_init(&rd88f6281_mvsdio_data);
        kirkwood_uart0_init();
  
        platform_device_register(&rd88f6281_nand_flash);

diff --cc arch/arm/mach-pxa/e740.c
Simple merge

diff --cc arch/arm/mach-pxa/e750.c
Simple merge

diff --cc arch/arm/mach-pxa/h5000.c
Simple merge

diff --cc arch/arm/mach-pxa/include/mach/regs-ssp.h
Simple merge

diff --cc arch/arm/mach-pxa/spitz.c
Simple merge

diff --cc drivers/ata/pata_icside.c
Simple merge

diff --cc drivers/net/arm/ixp4xx_eth.c
Simple merge

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

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

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

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

diff --cc drivers/watchdog/sa1100_wdt.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc sound/arm/pxa2xx-ac97-lib.c
Simple merge

diff --cc sound/arm/pxa2xx-ac97.c
Simple merge

diff --cc sound/soc/pxa/corgi.c
Simple merge

diff --cc sound/soc/pxa/poodle.c
Simple merge

diff --cc sound/soc/pxa/pxa-ssp.c
Simple merge

diff --cc sound/soc/pxa/pxa2xx-ac97.c
Simple merge

diff --cc sound/soc/pxa/pxa2xx-i2s.c
index 223de890259e11616994cc277d165f0e3123f95d,e6c24408c5f9fb23714b22173e2b1fad8a8877d8..2f4b6e489b7849a68eae4a76e4bb011c92bef129
--- 1/sound/soc/pxa/pxa2xx-i2s.c
--- 2/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@@ -24,8 -24,7 +24,7 @@@
  #include <sound/pxa2xx-lib.h>
  
  #include <mach/hardware.h>
 -#include <mach/pxa-regs.h>
 +#include <mach/dma.h>
- #include <mach/pxa2xx-gpio.h>
  #include <mach/audio.h>
  
  #include "pxa2xx-pcm.h"

diff --cc sound/soc/pxa/spitz.c
Simple merge

diff --cc sound/soc/pxa/tosa.c
Simple merge