From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] imx6q cpuidle for 3.9
Date: Wed, 30 Jan 2013 21:19:22 +0800 [thread overview]
Message-ID: <20130130131920.GD2757@S2101-09.ap.freescale.net> (raw)
In-Reply-To: <20130129175028.GC17935@quad.lixom.net>
On Tue, Jan 29, 2013 at 09:50:28AM -0800, Olof Johansson wrote:
> This has some small conflicts with the cleanup branch. Can you please base it
> on top of cleanup so we can avoid the merge conflicts when things go upstream?
> It's common to have the per-soc cleanup branches as bases for some of the
> feature branches just for this reason.
>
Ok, done as below.
The following changes since commit 1d7180e24e22a608cc4d7e8fd425a19a9394a7ed:
Merge tag 'imx-cleanup-3.9' into imx6q-cpuidle (2013-01-30 21:07:14 +0800)
are available in the git repository at:
git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx6q-cpudile-3.9
for you to fetch changes up to e5f9dec8ff5ff3f6254412abed1f68d758f6616b:
ARM: imx6q: support WAIT mode using cpuidle (2013-01-30 21:09:31 +0800)
----------------------------------------------------------------
imx6q cpuidle support for 3.9
- It's based on imx-cleanup-3.9 to avoid conflicts.
----------------------------------------------------------------
Shawn Guo (4):
ARM: imx: return zero in case next event gets a large increment
ARM: imx: mask gpc interrupts initially
ARM: imx: move imx6q_cpuidle_driver into a separate file
ARM: imx6q: support WAIT mode using cpuidle
arch/arm/mach-imx/Makefile | 6 ++-
arch/arm/mach-imx/clk-imx6q.c | 12 +++++
arch/arm/mach-imx/common.h | 3 ++
arch/arm/mach-imx/cpuidle-imx6q.c | 95 +++++++++++++++++++++++++++++++++++++
arch/arm/mach-imx/cpuidle.h | 5 ++
arch/arm/mach-imx/gpc.c | 5 ++
arch/arm/mach-imx/mach-imx6q.c | 17 +++----
arch/arm/mach-imx/platsmp.c | 10 ++++
arch/arm/mach-imx/time.c | 3 +-
9 files changed, 143 insertions(+), 13 deletions(-)
create mode 100644 arch/arm/mach-imx/cpuidle-imx6q.c
next prev parent reply other threads:[~2013-01-30 13:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-29 5:46 [GIT PULL] imx6q cpuidle for 3.9 Shawn Guo
2013-01-29 17:50 ` Olof Johansson
2013-01-30 13:19 ` Shawn Guo [this message]
2013-02-05 2:03 ` Shawn Guo
2013-02-05 6:25 ` 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=20130130131920.GD2757@S2101-09.ap.freescale.net \
--to=shawn.guo@linaro.org \
--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