From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 14 May 2011 10:06:36 +0000 (+0200)
Subject: Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into... 
X-Git-Tag: v3.0-rc1~402^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a18f22a968de17b29f2310cdb7ba69163e65ec15;p=pandora-kernel.git

Merge branch 'consolidate-clksrc-i8253' of ~rmk/linux-2.6-arm into timers/clocksource

Conflicts:
	arch/ia64/kernel/cyclone.c
	arch/mips/kernel/i8253.c
	arch/x86/kernel/i8253.c

Reason: Resolve conflicts so further cleanups do not conflict further

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

a18f22a968de17b29f2310cdb7ba69163e65ec15
Reading git-diff-tree failed