linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL] Timekeeping fixup for 3.11 (tip/timers/core)
@ 2013-06-24 22:54 John Stultz
  0 siblings, 0 replies; only message in thread
From: John Stultz @ 2013-06-24 22:54 UTC (permalink / raw)
  To: Thomas Gleixner; +Cc: Stephen Boyd, LKML

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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-06-24 22:54 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-24 22:54 [GIT PULL] Timekeeping fixup for 3.11 (tip/timers/core) John Stultz

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).