From patchwork Tue Oct 9 18:46:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [GIT,PULL,2/5] omap hwmod and clock fixes for v3.7-rc1 Date: Tue, 09 Oct 2012 08:46:26 -0000 From: Tony Lindgren X-Patchwork-Id: 190409 Message-Id: To: Arnd Bergmann , Olof Johansson Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org The following changes since commit 0e51793e162ca432fc5f04178cf82b80a92c2659: Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm (2012-10-07 21:20:57 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.7-rc1/fixes-hwmod-clock-signed-v3 for you to fetch changes up to eb20f31f6e7d3ac19738e5a45df9b09b25381e73: Merge tag 'omap-fixes-a-for-pre3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.7-rc1/fixes-hwmod-clock (2012-10-09 11:07:29 -0700) ---------------------------------------------------------------- >From Paul Walmsley : Some OMAP fixes for the 3.7 merge window, fixing mismerges, branch integration issues, and bugs after the arm-soc merges. ---------------------------------------------------------------- Jon Hunter (2): ARM: OMAP2+: hwmod data: Fix PMU interrupt definitions ARM: OMAP3: fix workaround for EMU clockdomain Paul Walmsley (2): ARM: OMAP: omap3evm: fix new sparse warning ARM: OMAP4/AM335x: hwmod: fix disable_module regression in hardreset handling Tony Lindgren (1): Merge tag 'omap-fixes-a-for-pre3.7' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.7-rc1/fixes-hwmod-clock Vaibhav Hiremath (1): ARM: am33xx: clk: Update clkdev table to add mcasp alias arch/arm/mach-omap2/board-omap3evm.c | 3 +- arch/arm/mach-omap2/clock33xx_data.c | 2 + arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 44 ++++++++++---------- arch/arm/mach-omap2/omap_hwmod.c | 31 ++++++++++++-- arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 +- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +- 6 files changed, 54 insertions(+), 30 deletions(-)