]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'omap-for-v3.7-rc1/fixes-hwmod-clock-signed-v3' of git://git.kernel.org...
authorOlof Johansson <olof@lixom.net>
Tue, 9 Oct 2012 21:04:35 +0000 (14:04 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 9 Oct 2012 22:00:55 +0000 (15:00 -0700)
commit09897319c87519fa7b699154c86ab34224841c8b
tree38c58b88667cbd3ceace54314046be1dac6a8a80
parent8d6ca3644552cdf630c5edfae1b567b75cfaf158
parent810ea8c9e786c1973647df2be81af654cc2f02cf
Merge tag 'omap-for-v3.7-rc1/fixes-hwmod-clock-signed-v3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

From Paul Walmsley <paul@pwsan.com> via Tony Lindgren:

Some OMAP fixes for the 3.7 merge window, fixing mismerges, branch
integration issues, and bugs after the arm-soc merges.

* tag 'omap-for-v3.7-rc1/fixes-hwmod-clock-signed-v3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP4/AM335x: hwmod: fix disable_module regression in hardreset handling
  ARM: OMAP3: fix workaround for EMU clockdomain
  ARM: OMAP: omap3evm: fix new sparse warning
  ARM: OMAP2+: hwmod data: Fix PMU interrupt definitions
  ARM: am33xx: clk: Update clkdev table to add mcasp alias
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c