From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 29 Aug 2009 08:34:18 +0000 (+0200)
Subject: Merge branch 'timers/posixtimers' into timers/tracing
X-Git-Tag: v2.6.32-rc1~168^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f71bb0ac5e85410601b0db29d7b1635345ea61a4;p=pandora-kernel.git

Merge branch 'timers/posixtimers' into timers/tracing

Merge reason: timer tracepoint patches depend on both branches

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

f71bb0ac5e85410601b0db29d7b1635345ea61a4
Reading git-diff-tree failed