tree a7d56d88fad5e444d7661484109758a2f436129e
parent a1c57e0fec53defe745e64417eacdbd3618c3e66
parent 798778b8653f64b7b2162ac70eca10367cff6ce8
author Thomas Gleixner <tglx@linutronix.de> 1305367596 +0200
committer Thomas Gleixner <tglx@linutronix.de> 1305367596 +0200

Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~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>