]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'v3.7-rc7' into next/cleanup
authorOlof Johansson <olof@lixom.net>
Mon, 26 Nov 2012 05:34:34 +0000 (21:34 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 26 Nov 2012 05:34:34 +0000 (21:34 -0800)
commitb19315c72f74179410fe2490d4430b30209ed9bd
tree293871b042e9ebc49b1d783f1b110eef541ddc97
parent4abad00df3b00904b150c6fd090549e2c3aa0ce8
parent246d3601f55f41652216d8074e46ded806ae7e02
Merge tag 'v3.7-rc7' into next/cleanup

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:
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