[GIT PULL] few more fixes for v3.3-rc6

[GIT PULL] few more fixes for v3.3-rc6

[Tony Lindgren]

Hi Arnd & Olof,

Here are few more fixes for the current -rc cycle if there's
still enough time to get them in.

Regards,

Tony


The following changes since commit 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d:
  Linus Torvalds (1):
        Linux 3.3-rc6

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap fixes

Cousson, Benoit (1):
      ARM: OMAP: irqs: Fix NR_IRQS value to handle PRCM interrupts

R Sricharan (1):
      ARM: OMAP2+: Fix module build errors with CONFIG_OMAP4_ERRATA_I688

Rajendra Nayak (1):
      ARM: OMAP2+: Remove apply_uV constraints for fixed regulator

Vaibhav Hiremath (1):
      ARM: OMAP: id: Add missing break statement in omap3xxx_check_revision

 arch/arm/mach-omap2/id.c               |    1 +
 arch/arm/mach-omap2/omap4-common.c     |    2 ++
 arch/arm/mach-omap2/twl-common.c       |    1 -
 arch/arm/plat-omap/include/plat/irqs.h |   10 +++++++++-
 4 files changed, 12 insertions(+), 2 deletions(-)

[GIT PULL] few more fixes for v3.3-rc6

[Tony Lindgren]

Olof,

* Tony Lindgren <tony@atomide.com> [120308 09:34]:
> 
> Vaibhav Hiremath (1):
>       ARM: OMAP: id: Add missing break statement in omap3xxx_check_revision

FYI, this one will cause a minor merge conflict with what's in
arm-soc/for-next, here's how to resolve for reference:

--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@@ -397,7 -342,8 +397,8 @@@ void __init omap3xxx_check_revision(voi
  		break;
  	case 0xb944:
  		omap_revision = AM335X_REV_ES1_0;
 -		*cpu_rev = "1.0";
 +		cpu_rev = "1.0";
+ 		break;
  	case 0xb8f2:
  		switch (rev) {
  		case 0:

Regards,

Tony

[GIT PULL] few more fixes for v3.3-rc6

[Olof Johansson]

On Thu, Mar 8, 2012 at 10:04 AM, Tony Lindgren <tony@atomide.com> wrote:
> Hi Arnd & Olof,
>
> Here are few more fixes for the current -rc cycle if there's
> still enough time to get them in.
>
> Regards,
>
> Tony
>
>
> The following changes since commit 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d:
> ?Linus Torvalds (1):
> ? ? ? ?Linux 3.3-rc6
>
> are available in the git repository at:
>
> ?git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap fixes

Pulled, thanks.


-Olof