From: Arnd Bergmann Date: Tue, 19 Feb 2013 21:48:22 +0000 (+0100) Subject: Merge branch 'next/fixes-non-critical' into for-next X-Git-Tag: next-20130220~18^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=238ac21c9eed83d27c91aa11c8b366bce8aec736;p=karo-tx-linux.git Merge branch 'next/fixes-non-critical' into for-next * next/fixes-non-critical: ARM: i.MX25: clk: parent per5_clk to AHB clock ARM: imx27: clk-imx27: SPI: Rename IPG clock and add PER clock --- 238ac21c9eed83d27c91aa11c8b366bce8aec736 diff --cc arch/arm/arm-soc-for-next-contents.txt index 05a9f16f5154,000000000000..65be13679755 mode 100644,000000..100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@@ -1,266 -1,0 +1,268 @@@ +for-next contents for 3.9: +Format is a little different from before in an attempt to make it easier to read: + + + + + <...> + <...> + +depends/cleanup + This branch contains next/cleanup as of + f8060f5446b1f2782f0a8ca9be2d870ea4198aee for others to base + their submissions on as needed. + +depends/rmk-perf + (perf branch from Will, merged through rmk and us for dependency reasons) + pull git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git for-rmk/perf + +depends/rmk/psci + (psci branch from Will, merged through rmk and us for dependency reasons) + pull git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git for-rmk/virt/psci + +depends/mmc + The mmc tree as of d2938758caae, needed for late/mvebu + + +next/fixes-non-critical + pxa/fixes-for-3.9 + pull git://github.com/hzhuang1/linux.git armsoc/fix + vexpress/fixes + pull git://git.linaro.org/people/pawelmoll/linux.git tags/vexpress/fixes-for-3.9 + patch 1358786701-28414-1-git-send-email-michal.simek@xilinx.com + omap/fixes-non-critical + pull git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/fixes-non-critical-signed-v2 + patch 1359123276-15833-4-git-send-email-arnd@arndb.de + patches 1360849767-1463135-1-git-send-email-arnd@arndb.de + patch 1360882071-4072668-3-git-send-email-arnd@arndb.de + samsung/fixes + pull git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/fixes-samsung + patch 07186d8f30c387aa3f47be8c98d34678ca4b5ba9.1360123662.git.viresh.kumar@linaro.org ++ imx/fixes ++ pull git://git.pengutronix.de/git/imx/linux-2.6.git tags/arm-imx-clk-fixes + +next/cleanup + timer/cleanup + pull git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git swarren-for-3.9-arm-timer-rework + patch 1357666417-8803-1-git-send-email-swarren@wwwdotorg.org + patch 1358185342-7518-1-git-send-email-swarren@wwwdotorg.org + patch 1358232649-19964-1-git-send-email-linux@prisktech.co.nz + clocksource/cleanup + bundle https://patchwork.kernel.org/user/bundle/3531/ + vt8500/timer + pull git://server.prisktech.co.nz/git/linuxwmt.git tags/vt8500/timer + irqchip/gic-vic-move + pull git://sources.calxeda.com/kernel/linux.git tags/gic-vic-to-irqchip + patch 1358499506-9790-1-git-send-email-shawn.guo@linaro.org + mvebu/cleanup + pull git://git.infradead.org/users/jcooper/linux.git tags/cleanup_for_v3.9 + pull git://git.infradead.org/users/jcooper/linux.git tags/cleanup_for_v3.9_round2 + pull git://git.infradead.org/users/jcooper/linux.git tags/cleanup_for_v3.9_round3 + imx/cleanup + pull git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-cleanup-3.9 + bcm2835/cleanup + pull git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git bcm2835-for-3.9-cleanup + patch 1359376250-18841-1-git-send-email-michal.simek@xilinx.com + ux500/no-idh + pull git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-no-idh + zynq/timer + pull git://git.xilinx.com/linux-xlnx.git zynq/timer + patch 1359518177-21245-1-git-send-email-swarren@wwwdotorg.org + patch 1359568170-26479-1-git-send-email-swarren@wwwdotorg.org + samsung/cleanup-header + pull git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/cleanup-header + mvebu/cleanup + pull git://git.infradead.org/users/jcooper/linux.git tags/drivers_for_v3.9 + wdog/cleanup + pull git://git.linaro.org/people/shawnguo/linux-2.6.git tags/cleanup-decompwdog-3.9 + patch 1360017159-24318-1-git-send-email-maxime.ripard@free-electrons.com + tegra/cleanup + pull git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-cleanup + samsung/cleanup-s3c24xx + pull git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/cleanup-s3c24xx + samsung/irq-s3c24xx + pull git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/irq-s3c24xx + samsung/cleanup-s3c24xx-2 + pull git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/cleanup-s3c24xx-2 + samsung/cleanup + pull git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/cleanup-samsung + at91/cleanup + pull git://github.com/at91linux/linux-at91.git tags/at91-cleanup + patch 1360706692-13622-1-git-send-email-robherring2@gmail.com + ux500/no-idh-fixes + pull git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/for-arm-soc-cleanup + patch 1360850491-1463387-1-git-send-email-arnd@arndb.de + +next/sh-pinmux + pull git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git pfc + pull git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-pinmux2-for-v3.9 + +next/drivers + ux500/cpufreq + pull git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-cpufreq-for-arm-soc + u300/dma-cleanup + pull http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/coh901318-for-arm-soc + vexpress/drivers + pull git://git.linaro.org/people/pawelmoll/linux.git tags/vexpress/drivers-for-3.9 + omap/gpmc + pull git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/gpmc-signed + mxs/soc + pull git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-soc-3.9 + + +next/multiplatform + omap/multiplatform + pull git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/multiplatform-enable-signed-v2 + vt8500/multiplatform + pull git://server.prisktech.co.nz/git/linuxwmt.git tags/vt8500-multiplatform-3.9 + patch 621fb4946273492b88fe9a903118047f497e00ee.1359057921.git.josh.cartwright@ni.com + patch 20130124201709.GB1036@beefymiracle.amer.corp.natinst.com + patch 20130205175126.GH25185@atomide.com + + two more patches for omap + omap/multiplatform-fixes + patches from 1360882071-4072668-1-git-send-email-arnd@arndb.de + +next/soc + vt8500/wm8x50 + depends vt8500/multiplatform + pull git://server.prisktech.co.nz/git/linuxwmt.git tags/armsoc-3.9 + patch 1358577868-29042-1-git-send-email-linux@prisktech.co.nz + prima2/marco + depends depends/cleanup + pull git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git marco-timer-cleanup-rebase + imx/soc + pull git://git.pengutronix.de/git/imx/linux-2.6.git tags/imx-soc + renesas/soc + pull git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git soc + davinci/soc + pull git://gitorious.org/linux-davinci/linux-davinci.git tags/davinci-for-v3.9/soc + bcm2835/soc + pull git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git bcm2835-for-3.9-soc + renesas/soc2 + pull git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v3.9 + patch 1359956496-8997-1-git-send-email-Barry.Song@csr.com + imx/cpuidle + pull git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx6q-cpudile-3.9 + mvebu/drivers + pull git://git.infradead.org/users/jcooper/linux.git tags/drivers_for_v3.9 + renesas/soc3 + pull git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc3-for-v3.9 + tegra/soc-ccf + pull git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-soc-ccf + tegra/usb-cleanup + pull git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-soc-usb + tegra/cpuidle + pull git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-soc-cpuidle + tegra/t114 + pull git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-soc-t114 + + three fixes from email + patch 1359976100-28871-1-git-send-email-hdoyu@nvidia.com + omap/pm + pull git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/pm-signed + imx/soc2 + pull git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-soc-3.9 + renesas/soc + pull git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc5-for-v3.9 + socfpga/hw + patch 1360625433-28067-2-git-send-email-dinguyen@altera.com + patch 1360625433-28067-3-git-send-email-dinguyen@altera.com + patch 1360625433-28067-4-git-send-email-dinguyen@altera.com + patch 1360625433-28067-5-git-send-email-dinguyen@altera.com + patch 1360850491-1463387-2-git-send-email-arnd@arndb.de + omap/usb + git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/usb-signed + +next/boards + renesas/defconfig + pull git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git defconfig + pull git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git defconfig2 + pxa/boards + pull git://github.com/hzhuang1/linux.git armsoc/boar + renesas/boards + pull git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git boards + davinci/boards + pull git://gitorious.org/linux-davinci/linux-davinci.git tags/davinci-for-v3.9/board + bcm2835/defconfig + pull git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git bcm2835-for-3.9-defconfig + reneasas/boards2 + pull git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards2-for-v3.9 + tegra/defconfig + pull git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-defconfig + omap/boards + pull git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/board-signed + omap/twl + pull git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/twl-signed-v2 + imx/defconfig + pull git://git.pengutronix.de/git/imx/linux-2.6.git tags/arm-imx-defconfig + +next/dt + davinci/dt + pull git://gitorious.org/linux-davinci/linux-davinci.git tags/davinci-for-v3.9/dt + nomadik/dt + (depends on depends/cleanup) + pull git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-devicetree + bcm2835/dt + pull git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git bcm2835-for-3.9-dt + patch 1359708725-21978-1-git-send-email-linus.walleij@stericsson.com + tegra/dt + (pulls in next/soc as of tegra/t114 merge) + pull git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-dt + at91/dt + pull git://github.com/at91linux/linux-at91.git tags/at91-dt + davinci/dt2 + pull git://gitorious.org/linux-davinci/linux-davinci.git tags/davinci-for-v3.9/dt-2 + mxs/dt + pull git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-dt-3.9 + sunxi/dt + (partially reverted) + pull https://github.com/mripard/linux.git tags/sunxi-dt-for-3.9 + at91/dt2 + pull git://github.com/at91linux/linux-at91.git tags/at91-dt-late + tegra/ccf-fixes + pull git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.9-soc-ccf-fixes + + +next/virt + depends depends/rmk-perf + depends depends/rmk-psci + depends depends/rmk-virt-base + depends depends/cleanup + timer/arch-timers + pull git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git for-arm-soc/arch-timers + virt/mach + pull git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git for-arm-soc/virt/mach + patch 20130211174731.GO9801@mudshark.cambridge.arm.com + +patch to fix warning (local only) + virt/vgic-vtimer + pull git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git kvm-arm/timer + +patch 1360882071-4072668-2-git-send-email-arnd@arndb.de + +late/dt + depends on imx/cpuidle + imx/dt + pull git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-dt-3.9 + +late/omap + omap/late-soc + pull git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/soc-signed + omap/late-am33xx + pull git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/am33xx-signed + omap/late-pm + pull git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/pm-wfi-take2-signed-v2 + omap/late-clock + pull git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/clock-signed + omap/late-pm-omap4 + pull git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/pm-omap4-signed + +patch 1360882071-4072668-4-git-send-email-arnd@arndb.de + +late/mvebu + depends on depends/mmc + mvebu/board + pull git://git.infradead.org/users/jcooper/linux.git tags/boards_for_v3.9 + pull git://git.infradead.org/users/jcooper/linux.git tags/boards_for_v3.9_round2 + pull git://git.infradead.org/users/jcooper/linux.git tags/boards_for_v3.9_round3 + +late/mvebu-dt + depends on mvebu/board + pull git://git.infradead.org/users/jcooper/linux.git tags/dt_for_v3.9 + pull git://git.infradead.org/users/jcooper/linux.git tags/dt_for_v3.9_round2