From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] few more fixes for v3.3-rc6
Date: Thu, 8 Mar 2012 10:13:46 -0800 [thread overview]
Message-ID: <20120308181345.GU12083@atomide.com> (raw)
In-Reply-To: <20120308180441.GT12083@atomide.com>
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
next prev parent reply other threads:[~2012-03-08 18:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-08 18:04 [GIT PULL] few more fixes for v3.3-rc6 Tony Lindgren
2012-03-08 18:13 ` Tony Lindgren [this message]
2012-03-08 18:57 ` Olof Johansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120308181345.GU12083@atomide.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).