Merge tag 'v3.7-rc7' into next/cleanup
Olof Johansson [Mon, 26 Nov 2012 05:34:34 +0000 (21:34 -0800)]
Merging in mainline back to next/cleanup since it has collected a few
conflicts between fixes going upstream and some of the cleanup patches.
Git doesn't auto-resolve some of them, and they're mostly noise so let's
take care of it locally.

Conflicts are in:
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/plat-omap/i2c.c
drivers/video/omap2/dss/dss.c

Signed-off-by: Olof Johansson <olof@lixom.net>

15 files changed:
1  2 
MAINTAINERS
arch/arm/mach-exynos/include/mach/map.h
arch/arm/mach-imx/ehci-imx25.c
arch/arm/mach-imx/ehci-imx35.c
arch/arm/mach-omap2/board-igep0020.c
arch/arm/mach-omap2/common-board-devices.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod.h
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/mach-omap2/twl-common.c
drivers/iommu/tegra-smmu.c
drivers/video/omap2/dss/dss.c
drivers/video/omap2/dss/hdmi.c
drivers/video/omap2/omapfb/omapfb-ioctl.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  #include <linux/io.h>
  #include <linux/platform_data/gpio-omap.h>
  #include <linux/power/smartreflex.h>
 -#include <linux/platform_data/omap_ocp2scp.h>
 +#include <linux/i2c-omap.h>
 +
 +#include <plat-omap/dma-omap.h>
  
 -#include <plat/omap_hwmod.h>
 -#include <plat/i2c.h>
 -#include <plat/dma.h>
++#include <linux/platform_data/omap_ocp2scp.h>
  #include <linux/platform_data/spi-omap2-mcspi.h>
  #include <linux/platform_data/asoc-ti-mcbsp.h>
 -#include <plat/mmc.h>
  #include <plat/dmtimer.h>
 -#include <plat/common.h>
  #include <plat/iommu.h>
  
 +#include "omap_hwmod.h"
  #include "omap_hwmod_common_data.h"
  #include "cm1_44xx.h"
  #include "cm2_44xx.h"
Simple merge
Simple merge
Simple merge
Simple merge