original_kernel/arch/mips/jz4740
Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next
Conflicts:
	MAINTAINERS
	arch/arm/mach-omap2/pm24xx.c
	drivers/scsi/bfa/bfa_fcpim.c

Needed to update to apply fixes for which the old branch was too
outdated.
2010-12-22 18:57:02 +01:00
..
Kconfig
Makefile
Platform
board-qi_lb60.c Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
clock-debugfs.c
clock.c
clock.h
dma.c
gpio.c
irq.c
irq.h
platform.c MIPS: JZ4740: Fix pcm device name 2010-12-16 18:10:57 +00:00
pm.c
prom.c
pwm.c
reset.c
reset.h
serial.c
serial.h
setup.c
time.c
timer.c
timer.h