tree 54562185002b22169d81e0fb3c21312cb510ac40
parent c0c463d34adf0c150e5e24fa412fa23f3f7ddc27
parent 06c3df49521c1b112b777cc4946e5de057c814ba
author Linus Torvalds <torvalds@linux-foundation.org> 1311442487 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1311442487 -0700

Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  clocksource: apb: Share APB timer code with other platforms