| commit | a18f22a968de17b29f2310cdb7ba69163e65ec15 | [log] [tgz] |
|---|---|---|
| author | Thomas Gleixner <tglx@linutronix.de> | Sat May 14 12:06:36 2011 +0200 |
| committer | Thomas Gleixner <tglx@linutronix.de> | Sat May 14 12:06:36 2011 +0200 |
| tree | a7d56d88fad5e444d7661484109758a2f436129e | |
| parent | a1c57e0fec53defe745e64417eacdbd3618c3e66 [diff] | |
| parent | 798778b8653f64b7b2162ac70eca10367cff6ce8 [diff] |
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>