From: Arnd Bergmann Date: Sun, 30 Oct 2011 23:52:14 +0000 (+0100) Subject: Merge branches 'stericsson/timer' and 'omap/dmtimer' into next/timer X-Git-Tag: firefly_0821_release~3680^2~4240^2~1 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=65af7c4608f7b7019e2faa220fb9624988965873;p=firefly-linux-kernel-4.4.55.git Merge branches 'stericsson/timer' and 'omap/dmtimer' into next/timer --- 65af7c4608f7b7019e2faa220fb9624988965873