Merge branch 'next/cleanup' into for-next

diff --cc arch/arm/Kconfig
Simple merge

diff --cc drivers/gpio/gpio-pxa.c
index db5c2958f97387cf4df60d5bca7c08d2bc61f482,9cac88a65f78402e2a45b919799576810d9ab9fd..9528779ca463154334fa54db9a22b6f852cddd0f
--- 1/drivers/gpio/gpio-pxa.c
--- 2/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@@ -464,12 -530,12 +489,12 @@@ static int pxa_irq_domain_map(struct ir
  
  const struct irq_domain_ops pxa_irq_domain_ops = {
        .map    = pxa_irq_domain_map,
+       .xlate  = irq_domain_xlate_twocell,
  };
  
- #ifdef CONFIG_OF
  static int __devinit pxa_gpio_probe_dt(struct platform_device *pdev)
  {
 -      int ret, nr_banks, nr_gpios, irq_base;
 +      int ret, nr_banks, nr_gpios;
        struct device_node *prev, *next, *np = pdev->dev.of_node;
        const struct of_device_id *of_id =
                                of_match_device(pxa_gpio_dt_ids, &pdev->dev);

diff --cc drivers/i2c/busses/i2c-omap.c
Simple merge

diff --cc drivers/spi/spi-omap2-mcspi.c
Simple merge