From: arnd@arndb•de (Arnd Bergmann)
To: linux-arm-kernel@lists•infradead.org
Subject: [GIT PULL] Timer clean-ups for 3.10, Part 2
Date: Mon, 15 Apr 2013 23:20:28 +0200 [thread overview]
Message-ID: <201304152320.28401.arnd@arndb.de> (raw)
In-Reply-To: <516C0257.8040103@gmail.com>
On Monday 15 April 2013, Rob Herring wrote:
> It is quite messed up because the mct timer changes are not based on
> arm-soc/clksrc/cleanup. Any timer changes adding CLKSRC_OF support need
> to be based on this. I've fixed it up in this branch (untested):
>
> git://sources.calxeda.com/kernel/linux.git exynos-mct-merge
>
> I merged with clksrc-cleanup-for-3.10-part2 and fixed it in the merge,
> but really either the mct branch should be rebased or some of the
> changes can be a preparatory commit before merging.
Note that I also merged the branches when pulling in the samsung changes,
and did a complex merge there. We should ensure that we use the same
merge here.
Arnd
next prev parent reply other threads:[~2013-04-15 21:20 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-11 20:44 [GIT PULL] Timer clean-ups for 3.10, Part 2 Rob Herring
2013-04-11 20:57 ` Arnd Bergmann
2013-04-12 1:33 ` Haojian Zhuang
2013-04-13 6:50 ` Olof Johansson
2013-04-15 13:36 ` Rob Herring
2013-04-15 21:20 ` Arnd Bergmann [this message]
2013-04-17 16:57 ` Olof Johansson
2013-04-17 18:48 ` Olof Johansson
2013-04-19 10:52 ` Kukjin Kim
2013-04-16 19:24 ` Olof Johansson
2013-04-17 0:27 ` Stephen Boyd
2013-04-17 13:40 ` Rob Herring
2013-04-17 18:22 ` Stephen Boyd
2013-04-17 23:18 ` Rob Herring
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=201304152320.28401.arnd@arndb.de \
--to=arnd@arndb$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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