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
..
common	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
fuloong-2e	MIPS: Loongson: Oprofile: add a new do_perfcnt_IRQ()	2010-08-05 13:26:24 +01:00
lemote-2f	MIPS: Loongson: Remove unused macro LOONGSON_PERFCNT_IRQ	2010-08-05 13:26:26 +01:00
Kconfig	MIPS: Kconfig cleanup	2010-10-29 19:08:26 +01:00
Makefile
Platform	MIPS: Loongson: Migrate makefile to new Platform file	2010-08-05 13:25:45 +01:00