From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 11 Nov 2011 07:10:42 +0000 (+0100)
Subject: Merge branch 'formingo/3.2/tip/timers/core' of git://git.linaro.org/people/jstultz... 
X-Git-Tag: v3.2-rc4~19^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=367177e50189ab0a983b52f3d3f7eb2a1927db71;p=pandora-kernel.git

Merge branch 'formingo/3.2/tip/timers/core' of git://git.linaro.org/people/jstultz/linux into timers/core

Conflicts:
	kernel/time/timekeeping.c
---

367177e50189ab0a983b52f3d3f7eb2a1927db71
Reading git-diff-tree failed