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
..
mach-ap325rxa	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-10-30 08:26:25 -07:00
mach-cayman	sh64: irq_data conversion.	2010-10-27 15:38:59 +09:00
mach-dreamcast	sh: mach-dreamcast: irq_data conversion.	2010-10-27 14:36:28 +09:00
mach-ecovec24	sh: Add div6_reparent_clks to clock framework for FSI	2010-11-29 12:59:22 +09:00
mach-highlander	sh: switch boards to clkdev	2010-05-13 17:38:07 +09:00
mach-hp6xx	suspend: constify platform_suspend_ops	2010-11-16 14:14:02 +01:00
mach-kfr2r09	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-10-30 08:26:25 -07:00
mach-landisk	sh: mach-landisk: irq_data conversion.	2010-10-27 14:53:01 +09:00
mach-lboxre2	sh: Convert p3_ioremap() users to ioremap_prot().	2010-01-19 13:55:41 +09:00
mach-microdev	sh: mach-microdev: SuperIO-relative ioport mapping.	2010-10-29 18:42:22 +09:00
mach-migor	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-10-30 08:26:25 -07:00
mach-r2d	sh: Mass ctrl_in/outX to __raw_read/writeX conversion.	2010-01-26 12:58:40 +09:00
mach-rsk	sh: Mass ctrl_in/outX to __raw_read/writeX conversion.	2010-01-26 12:58:40 +09:00
mach-sdk7780	sh: Mass ctrl_in/outX to __raw_read/writeX conversion.	2010-01-26 12:58:40 +09:00
mach-sdk7786	sh: mach-sdk7786: Add support for the FPGA SRAM.	2010-10-15 02:13:04 +09:00
mach-se	sh: se/7724: Remove FSI/B of GPIO init code	2010-12-03 14:42:05 +09:00
mach-sh03	sh: Mass ctrl_in/outX to __raw_read/writeX conversion.	2010-01-26 12:58:40 +09:00
mach-sh7763rdp	sh: Mass ctrl_in/outX to __raw_read/writeX conversion.	2010-01-26 12:58:40 +09:00
mach-x3proto	sh: mach-x3proto: irq_data conversion.	2010-10-27 15:11:01 +09:00
board-edosk7705.c	sh: mach-edosk7705: Kill off machtype, consolidate board def.	2010-10-29 19:38:19 +09:00
board-edosk7760.c	sh: edosk7760: Correct size of bootloader flash partition.	2008-09-21 10:32:29 +09:00
board-espt.c	sh: espt-giga board support	2009-03-17 15:18:52 +09:00
board-magicpanelr2.c	sh: Mass ctrl_in/outX to __raw_read/writeX conversion.	2010-01-26 12:58:40 +09:00
board-polaris.c	sh: Mass ctrl_in/outX to __raw_read/writeX conversion.	2010-01-26 12:58:40 +09:00
board-secureedge5410.c	sh: mach-snapgear: Kill off machtype, consolidate board def.	2010-10-29 19:06:53 +09:00
board-sh2007.c	sh: SH-2007 board support.	2010-06-21 15:10:51 +09:00
board-sh7757lcr.c	sh: add sh7757lcr board support	2010-07-06 17:38:32 +09:00
board-sh7785lcr.c	sh: Prevent 64-bit pgprot clobbering across ioremap implementations.	2010-01-19 13:34:38 +09:00
board-shmin.c	sh: Mass ctrl_in/outX to __raw_read/writeX conversion.	2010-01-26 12:58:40 +09:00
board-titan.c	sh: mach-titan: Kill off unused PIO port mangling.	2010-01-28 15:08:21 +09:00
board-urquell.c	sh: Move platform smp ops in to their own structure.	2010-04-21 12:23:25 +09:00
Kconfig	sh: mach-systemh: Kill off dead board.	2010-10-29 19:11:56 +09:00
Makefile	sh: mach-edosk7705: Kill off machtype, consolidate board def.	2010-10-29 19:38:19 +09:00