projects / linux-flexiantxendom0-3.2.10.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 7cc026f 489e7be)
Merge branch 'next/fixes-non-critical' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Tue, 20 Mar 2012 22:42:24 +0000 (22:42 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 20 Mar 2012 22:42:24 +0000 (22:42 +0000)
commitf907ab06bb021bcb91d39c8d1b36536ebdb318fa
tree6020618997a6ea1b5f5b59c89df35344023f7c82tree | snapshot
parent7cc026f21e2acdcea8640df5da470c6fdca92911commit | diff
parent489e7bece7f6859a7df484a4dce08fa51fb0d876commit | diff
Merge branch 'next/fixes-non-critical' into next/drivers

Conflicts:
arch/arm/mach-lpc32xx/clock.c
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c

The conflicts with pxa are non-obvious, we have multiple branches
adding and removing the same clock settings. According to
Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct
fix here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
17 files changed:
MAINTAINERS diff1 | diff2 | blob | history
arch/arm/Kconfig diff1 | diff2 | blob | history
arch/arm/configs/imx_v4_v5_defconfig diff1 | diff2 | blob | history
arch/arm/mach-exynos/mach-universal_c210.c diff1 | diff2 | blob | history
arch/arm/mach-imx/mm-imx3.c diff1 | diff2 | blob | history
arch/arm/mach-lpc32xx/clock.c diff1 | diff2 | blob | history
arch/arm/mach-lpc32xx/common.h diff1 | diff2 | blob | history
arch/arm/mach-lpc32xx/phy3250.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/omap_hwmod_44xx_data.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/sr_device.c diff1 | diff2 | blob | history
arch/arm/mach-pxa/pxa3xx.c diff1 | diff2 | blob | history
arch/arm/mach-pxa/pxa95x.c diff1 | diff2 | blob | history
arch/arm/mach-s3c2440/mach-gta02.c diff1 | diff2 | blob | history
arch/arm/mach-s3c2440/mach-rx1950.c diff1 | diff2 | blob | history
arch/arm/plat-samsung/devs.c diff1 | diff2 | blob | history
drivers/mmc/host/mmci.c diff1 | diff2 | blob | history
drivers/mmc/host/sdhci-esdhc-imx.c diff1 | diff2 | blob | history
Port of xen3.3 xenlinux code to Ubuntu packaged SUSE kernel (3.2.10)