Tony Lindgren c81592ba1b Merge branch 'omap-upstream' into for-next ...

Conflicts:
	arch/arm/mach-omap2/Makefile

2009-05-28 15:41:03 -07:00

..

board-ams-delta.c

…

board-fsample.c

…

board-generic.c

…

board-h2-mmc.c

ARM: OMAP1: Simplify board-h2 MMC setup

2009-04-23 11:10:47 -07:00

board-h2.c

…

board-h2.h

…

board-h3-mmc.c

ARM: OMAP1: Fix mmc_set_power GPIO usage

2009-04-23 11:10:48 -07:00

board-h3.c

ARM: OMAP: Remove old dead gpio expander code

2009-04-23 11:10:40 -07:00

board-h3.h

…

board-innovator.c

…

board-nokia770.c

ARM: OMAP1: Make 770 LCD work

2009-05-28 14:03:31 -07:00

board-osk.c

…

board-palmte.c

…

board-palmtt.c

…

board-palmz71.c

…

board-perseus2.c

…

board-sx1-mmc.c

…

board-sx1.c

…

board-voiceblue.c

…

clock.c

OMAP2xxx clock: rename clk_init_one() to clk_preinit()

2009-05-12 17:50:30 -06:00

clock.h

…

devices.c

…

fpga.c

…

id.c

…

io.c

…

irq.c

…

Kconfig

ARM: OMAP1: Misc clean-up

2009-05-25 11:08:44 -07:00

leds-h2p2-debug.c

…

leds-innovator.c

…

leds-osk.c

…

leds.c

…

leds.h

…

mailbox.c

…

Makefile

ARM: OMAP1: Misc clean-up

2009-05-25 11:08:44 -07:00

Makefile.boot

…

mcbsp.c

OMAP1: clock: Typo fix for clock in omap1

2009-04-23 21:11:07 -06:00

mux.c

…

pm.c

OMAP1: PM: update and decouple from OMAP2/3 PM core

2009-05-28 10:59:11 -07:00

pm.h

OMAP1: PM: update and decouple from OMAP2/3 PM core

2009-05-28 10:59:11 -07:00

serial.c

OMAP1: PM: update and decouple from OMAP2/3 PM core

2009-05-28 10:59:11 -07:00

sleep.S

OMAP1: PM: update and decouple from OMAP2/3 PM core

2009-05-28 10:59:11 -07:00

sram.S

…

time.c

clocksource: pass clocksource to read() callback

2009-04-21 13:41:47 -07:00

timer32k.c

…