Tony Lindgren d21872b368 Merge branch 'v2.6.35-omap-mailbox-for-next' of git://gitorious.org/~doyu/lk/mainline into omap-for-linus ...

Conflicts:
	arch/arm/mach-omap1/devices.c

2010-08-04 16:10:38 +03:00

..

include/mach

…

ams-delta-fiq-handler.S

…

ams-delta-fiq.c

…

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

…

board-h2.c

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

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

board-h2.h

…

board-h3-mmc.c

…

board-h3.c

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

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

board-h3.h

…

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

…

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

…

clock.c

…

clock.h

…

devices.c

omap: mailbox: standarize on 'omap-mailbox'

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

flash.c

…

fpga.c

…

i2c.c

…

id.c

…

io.c

…

irq.c

…

Kconfig

…

lcd_dma.c

…

leds-h2p2-debug.c

…

leds-innovator.c

…

leds-osk.c

…

leds.c

…

leds.h

…

mailbox.c

omap: mailbox: reorganize headers

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

Makefile

…

Makefile.boot

…

mcbsp.c

…

mux.c

…

opp_data.c

…

opp.h

…

pm.c

…

pm.h

…

serial.c

…

sleep.S

…

sram.S

…

time.c

…

timer32k.c

…

usb.c

…