From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 14 Aug 2009 13:59:00 +0000 (+0200)
Subject: Merge branch 'linus' into timers/core
X-Git-Tag: v2.6.32-rc1~168^2~29
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4cd1993f0046fbc765dbf20af90966f5661e3789;p=~shefty%2Frdma-dev.git

Merge branch 'linus' into timers/core

Reason: Martin's timekeeping cleanup series depends on both
timers/core and mainline changes.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

4cd1993f0046fbc765dbf20af90966f5661e3789