Merge branch 'origin' into devel
Russell King [Sat, 28 Mar 2009 20:29:51 +0000 (20:29 +0000)]
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c

26 files changed:
1  2 
Documentation/kernel-parameters.txt
MAINTAINERS
arch/arm/mach-kirkwood/common.c
arch/arm/mach-kirkwood/rd88f6281-setup.c
arch/arm/mach-pxa/e740.c
arch/arm/mach-pxa/e750.c
arch/arm/mach-pxa/h5000.c
arch/arm/mach-pxa/include/mach/regs-ssp.h
arch/arm/mach-pxa/spitz.c
drivers/ata/pata_icside.c
drivers/net/arm/ixp4xx_eth.c
drivers/net/smc91x.h
drivers/spi/omap2_mcspi.c
drivers/spi/omap_uwire.c
drivers/spi/pxa2xx_spi.c
drivers/watchdog/sa1100_wdt.c
lib/Kconfig.debug
sound/arm/pxa2xx-ac97-lib.c
sound/arm/pxa2xx-ac97.c
sound/soc/pxa/corgi.c
sound/soc/pxa/poodle.c
sound/soc/pxa/pxa-ssp.c
sound/soc/pxa/pxa2xx-ac97.c
sound/soc/pxa/pxa2xx-i2s.c
sound/soc/pxa/spitz.c
sound/soc/pxa/tosa.c

@@@ -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
Simple merge
@@@ -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);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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"
Simple merge
Simple merge