From: Arnd Bergmann <arnd@arndb.de>
Date: Sun, 30 Oct 2011 23:52:14 +0000 (+0100)
Subject: Merge branches 'stericsson/timer' and 'omap/dmtimer' into next/timer
X-Git-Tag: v3.2-rc1~96^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65af7c4608f7b7019e2faa220fb9624988965873;p=pandora-kernel.git

Merge branches 'stericsson/timer' and 'omap/dmtimer' into next/timer
---

65af7c4608f7b7019e2faa220fb9624988965873
Reading git-diff-tree failed