android_kernel_xiaomi_sm8350/arch/blackfin/kernel
Thomas Gleixner a18f22a968 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>
2011-05-14 12:06:36 +02:00
..
cplb-mpu Blackfin: Rename IRQ flags handling functions 2010-10-07 14:08:52 +01:00
cplb-nompu Blackfin: no-mpu: fix masking of small uncached dma region 2011-01-10 07:18:18 -05:00
.gitignore
asm-offsets.c
bfin_dma_5xx.c Blackfin: bf54x: add kconfig for UART2/3 DMA channel assignments 2011-03-18 03:49:23 -04:00
bfin_gpio.c Blackfin: gpio: add peripheral group check 2010-10-22 04:02:01 -04:00
bfin_ksyms.c Blackfin: move string functions to normal lib/ assembly 2010-05-22 14:19:09 -04:00
cplbinfo.c
dma-mapping.c
dumpstack.c Blackfin: make hardware trace output a little more useful 2010-05-21 09:40:19 -04:00
early_printk.c
entry.S
exception.c Blackfin: split kernel/traps.c 2010-05-21 09:40:17 -04:00
fixed_code.S
flat.c
ftrace-entry.S Blackfin: add support for dynamic ftrace 2010-08-06 12:55:54 -04:00
ftrace.c Blackfin: add support for dynamic ftrace 2010-08-06 12:55:54 -04:00
gptimers.c Blackfin: gptimers: fix thinko when disabling timers 2011-04-13 19:34:05 -04:00
init_task.c
ipipe.c Blackfin/ipipe: upgrade to I-pipe mainline 2011-03-18 04:01:10 -04:00
irqchip.c bfin: Convert irq namespace 2011-03-29 14:47:59 +02:00
kgdb_test.c Blackfin: kgdb_test: make sure to initialize num2 2011-01-10 07:18:23 -05:00
kgdb.c Fix common misspellings 2011-03-31 11:26:23 -03:00
Makefile Blackfin: add support for dynamic ftrace 2010-08-06 12:55:54 -04:00
module.c Blackfin: use more standard pr_fmt in the module loader 2011-03-25 16:54:12 -04:00
nmi.c
process.c BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
pseudodbg.c Blackfin: show the whole accumulator in the pseudo DBG insn 2010-05-22 14:19:06 -04:00
ptrace.c ptrace: cleanup arch_ptrace() and friends on Blackfin 2010-10-27 18:03:10 -07:00
reboot.c
setup.c Blackfin: SMP: work around anomaly 05000491 2011-03-18 04:01:04 -04:00
shadow_console.c
signal.c Blackfin: add support for restart_syscall() 2010-03-09 00:30:51 -05:00
stacktrace.c
sys_bfin.c Blackfin: add new cacheflush syscall 2010-10-22 03:48:59 -04:00
time-ts.c Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource 2011-05-14 12:06:36 +02:00
time.c blackfin: Switch from do_timer() to xtime_update() 2011-01-31 14:55:44 +01:00
trace.c bfin: Use proper accessors in trace 2011-03-29 14:47:59 +02:00
traps.c Fix common misspellings 2011-03-31 11:26:23 -03:00
vmlinux.lds.S Blackfin: SMP: work around anomaly 05000491 2011-03-18 04:01:04 -04:00