Mark Brown e4862f2f6f Merge branch 'for-2.6.36' into for-2.6.37 ...

Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.

Conflicts:
	arch/arm/mach-mx2/clock_imx27.c
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-zoom2.c
	sound/soc/fsl/mpc5200_dma.c
	sound/soc/fsl/mpc5200_dma.h
	sound/soc/fsl/mpc8610_hpcd.c
	sound/soc/pxa/spitz.c

2010-08-16 18:42:58 +01:00

..

include/mach

omap: Fix DEBUG_LL uart to access phys addr when MMU isn't enable

2010-08-04 12:17:53 +03:00

ams-delta-fiq-handler.S

OMAP1: Amstrad Delta: add FIQ handler for serial keyboardport interrupt processing

2010-05-05 11:11:10 -07:00

ams-delta-fiq.c

OMAP1: Amstrad Delta: add a handler for processing interruptsgenerated by the FIQ routine

2010-05-05 11:11:10 -07:00

board-ams-delta.c

Merge branch 'devel-map-io' into omap-for-linus

2010-08-04 14:43:45 +03:00

board-fsample.c

Merge branch 'devel-map-io' into omap-for-linus

2010-08-04 14:43:45 +03:00

board-generic.c

Merge branch 'devel-map-io' into omap-for-linus

2010-08-04 14:43:45 +03:00

board-h2-mmc.c

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

board-h2.c

Merge branch 'devel-map-io' into omap-for-linus

2010-08-04 14:43:45 +03:00

board-h2.h

ARM: OMAP: No need to include board-h2.h from hardware.h

2009-03-23 18:07:33 -07:00

board-h3-mmc.c

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

board-h3.c

Merge branch 'devel-map-io' into omap-for-linus

2010-08-04 14:43:45 +03:00

board-h3.h

ARM: OMAP: No need to include board-h3.h from hardware.h

2009-03-23 18:07:33 -07:00

board-htcherald.c

Merge branch 'devel-map-io' into omap-for-linus

2010-08-04 14:43:45 +03:00

board-innovator.c

Merge branch 'devel-map-io' into omap-for-linus

2010-08-04 14:43:45 +03:00

board-nokia770.c

Merge branch 'devel-map-io' into omap-for-linus

2010-08-04 14:43:45 +03:00

board-osk.c

Merge branch 'devel-map-io' into omap-for-linus

2010-08-04 14:43:45 +03:00

board-palmte.c

Merge branch 'devel-map-io' into omap-for-linus

2010-08-04 14:43:45 +03:00

board-palmtt.c

Merge branch 'devel-map-io' into omap-for-linus

2010-08-04 14:43:45 +03:00

board-palmz71.c

Merge branch 'devel-map-io' into omap-for-linus

2010-08-04 14:43:45 +03:00

board-perseus2.c

Merge branch 'devel-map-io' into omap-for-linus

2010-08-04 14:43:45 +03:00

board-sx1-mmc.c

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

board-sx1.c

Merge branch 'devel-map-io' into omap-for-linus

2010-08-04 14:43:45 +03:00

board-voiceblue.c

Merge branch 'devel-map-io' into omap-for-linus

2010-08-04 14:43:45 +03:00

clock_data.c

Merge branch 'for_2.6.36' of git://git.pwsan.com/linux-2.6 into omap-for-linus

2010-08-04 08:46:24 +03:00

clock.c

OMAP1: clock: some cleanup

2010-07-26 16:34:28 -06:00

clock.h

OMAP1: clock: some cleanup

2010-07-26 16:34:28 -06:00

devices.c

Merge branch 'for-2.6.36' into for-2.6.37

2010-08-16 18:42:58 +01:00

flash.c

omap: convert boards to use physmap-flash

2010-02-15 10:03:32 -08:00

fpga.c

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

i2c.c

omap: i2c: Fix muxing for command line enabled bus

2010-02-25 14:45:08 -08:00

id.c

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

io.c

ARM: OMAP: Convert to use ->reserve method to reserve boot time memory

2010-07-16 11:06:41 +01:00

irq.c

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

Kconfig

Merge branch 'for_2.6.36' of git://git.pwsan.com/linux-2.6 into omap-for-linus

2010-08-04 08:46:24 +03:00

lcd_dma.c

omap1: LCD_DMA: Use some define rather than a hexadecimal

2009-12-11 16:16:36 -08:00

leds-h2p2-debug.c

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

leds-innovator.c

[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach

2008-08-07 09:55:48 +01:00

leds-osk.c

ARM: OMAP: switch to standard gpio get/set calls

2008-12-10 17:35:25 -08:00

leds.c

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

leds.h

[PATCH] ARM: 2799/1: OMAP update 4/11: Move OMAP1 LED code into mach-omap1 directory

2005-07-10 19:58:10 +01:00

mailbox.c

omap: mailbox: reorganize headers

2010-08-04 15:50:20 +03:00

Makefile

omap: Move omap1 USB platform init code into mach-omap1/usb.c

2010-07-05 16:31:30 +03:00

Makefile.boot

[PATCH] ARM: 2798/1: OMAP update 2/11: Change ARM Kconfig to support omap1 and omap2

2005-07-10 19:58:08 +01:00

mcbsp.c

Removing dead OMAP_DSP

2010-07-05 16:31:54 +03:00

mux.c

Merge branch 'devel-misc' into omap-for-linus

2010-08-02 14:23:38 +03:00

opp_data.c

OMAP1 clock: convert mach-omap1/clock.h to mach-omap1/clock_data.c

2009-12-11 17:00:40 -07:00

opp.h

OMAP1 clock: convert mach-omap1/clock.h to mach-omap1/clock_data.c

2009-12-11 17:00:40 -07:00

pm.c

omap: headers: Move remaining headers from include/mach to include/plat

2009-10-20 09:40:47 -07:00

pm.h

OMAP850: PM: Add an ARCH_OMAP850 check

2009-10-07 23:14:08 +01:00

serial.c

omap1: omap7xx clocks, mux, serial fixes

2010-08-02 14:21:39 +03:00

sleep.S

OMAP7XX: Rename all the rest of the omap730 references in omap1 core

2009-10-07 23:14:06 +01:00

sram.S

OMAP: Remove OMAP_IO_ADDRESS, use OMAP1_IO_ADDRESS and OMAP2_IO_ADDRESS instead

2009-08-28 10:50:33 -07:00

time.c

OMAP: Remove OMAP_IO_ADDRESS, use OMAP1_IO_ADDRESS and OMAP2_IO_ADDRESS instead

2009-08-28 10:50:33 -07:00

timer32k.c

arm: omap1: remove dead code from timer32k.c

2010-04-22 17:32:36 -07:00

usb.c

omap: Move omap1 USB platform init code into mach-omap1/usb.c

2010-07-05 16:31:30 +03:00