projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a1c57e0 798778b)
Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into...
authorThomas Gleixner <tglx@linutronix.de>
Sat, 14 May 2011 10:06:36 +0000 (12:06 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 14 May 2011 10:06:36 +0000 (12:06 +0200)
commita18f22a968de17b29f2310cdb7ba69163e65ec15
treea7d56d88fad5e444d7661484109758a2f436129etree | snapshot (tar.gz zip)
parenta1c57e0fec53defe745e64417eacdbd3618c3e66commit | diff
parent798778b8653f64b7b2162ac70eca10367cff6ce8commit | diff
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>
arch/alpha/kernel/time.c diff1 | diff2 | blob | history
arch/blackfin/kernel/time-ts.c diff1 | diff2 | blob | history
arch/ia64/kernel/time.c diff1 | diff2 | blob | history
arch/microblaze/kernel/timer.c diff1 | diff2 | blob | history
arch/mips/sgi-ip27/ip27-timer.c diff1 | diff2 | blob | history
arch/x86/kernel/apb_timer.c diff1 | diff2 | blob | history
arch/x86/kernel/i8253.c diff1 | diff2 | blob | history
arch/x86/lguest/boot.c diff1 | diff2 | blob | history
arch/x86/xen/time.c diff1 | diff2 | blob | history
include/linux/clocksource.h diff1 | diff2 | blob | history