korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-26 21:54:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
a18f22a968
linux/arch/mips/jz4740
History
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
..
board-qi_lb60.c Fix common misspellings 2011-03-31 11:26:23 -03:00
clock-debugfs.c MIPS: JZ4740: Add clock API support. 2010-08-05 13:26:12 +01:00
clock.c MIPS: JZ4740: Add clock API support. 2010-08-05 13:26:12 +01:00
clock.h MIPS: JZ4740: Add clock API support. 2010-08-05 13:26:12 +01:00
dma.c MIPS: JZ4740: Add DMA support. 2010-08-05 13:26:15 +01:00
gpio.c MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
irq.c MIPS: Convert the irq functions to the new names 2011-03-29 14:48:07 +02:00
irq.h MIPS: JZ4740: Add IRQ handler code 2010-08-05 13:26:13 +01:00
Kconfig MIPS: JZ4740: Add qi_lb60 board support 2010-08-05 13:26:20 +01:00
Makefile mips: change to new flag variable 2011-03-17 14:02:56 +01:00
Platform MIPS: jz4740: Fix Kbuild Platform file. 2010-10-19 18:32:39 +01:00
platform.c watchdog: add JZ4740 watchdog driver 2011-03-15 16:01:44 +00:00
pm.c suspend: constify platform_suspend_ops 2010-11-16 14:14:02 +01:00
prom.c MIPS: jz4740: Fix section mismatch in prom.c 2010-12-16 18:10:53 +00:00
pwm.c MIPS: JZ4740: Add PWM support 2010-08-05 13:26:16 +01:00
reset.c MIPS: JZ4740: Add power-management and system reset support 2010-08-05 13:26:14 +01:00
reset.h MIPS: JZ4740: Add power-management and system reset support 2010-08-05 13:26:14 +01:00
serial.c MIPS: JZ4740: Add serial support 2010-08-05 13:26:16 +01:00
serial.h MIPS: JZ4740: Add serial support 2010-08-05 13:26:16 +01:00
setup.c MIPS: JZ4740: Add setup code 2010-08-05 13:26:14 +01:00
time.c mips: convert to clocksource_register_hz/khz 2011-02-21 13:33:50 -08:00
timer.c MIPS: JZ4740: Add timer support 2010-08-05 13:26:13 +01:00
timer.h MIPS: JZ4740: Add timer support 2010-08-05 13:26:13 +01:00