original_kernel/arch/mips/loongson/common
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
..
cs5536
Makefile
bonito-irq.c
cmdline.c
early_printk.c
env.c
gpio.c
init.c
irq.c
machtype.c
mem.c
pci.c
platform.c
pm.c
reset.c
rtc.c
serial.c
setup.c
time.c
uart_base.c