All of lore.kernel.org
 help / color / mirror / Atom feed
From: John Stultz <john.stultz@linaro.org>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: Stephen Boyd <sboyd@codeaurora.org>, LKML <linux-kernel@vger.kernel.org>
Subject: [GIT PULL] Timekeeping fixup for 3.11 (tip/timers/core)
Date: Mon, 24 Jun 2013 15:54:39 -0700	[thread overview]
Message-ID: <51C8CE2F.1050008@linaro.org> (raw)

Hey Thomas,
     Got one small fix for 3.11 for tip/timers/core. This works around a 
collision with changes in the arm-soc tree that is causing build 
failures, allowing for a smoother transition to the generic sched_clock 
work.

Let me know if you have any objections.

thanks
-john



The following changes since commit d3d8fee4138a06b4b9ca172d25b8412fc33ad3f3:

   Revert "dw_apb_timer_of.c: Remove parts that were picoxcell-specific" 
(2013-06-18 16:02:04 -0700)

are available in the git repository at:

   git://git.linaro.org/people/jstultz/linux.git fortglx/3.11/time

for you to fetch changes up to 629a6a2b7762a474177d08043bea094dd27e0a54:

   sched_clock: Add temporary asm/sched_clock.h (2013-06-21 10:17:44 -0700)

----------------------------------------------------------------
Stephen Boyd (1):
       sched_clock: Add temporary asm/sched_clock.h

  arch/arm/include/asm/sched_clock.h | 4 ++++
  1 file changed, 4 insertions(+)
  create mode 100644 arch/arm/include/asm/sched_clock.h

                 reply	other threads:[~2013-06-24 22:54 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=51C8CE2F.1050008@linaro.org \
    --to=john.stultz@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sboyd@codeaurora.org \
    --cc=tglx@linutronix.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.