Jens Axboe e4b636366c Merge branch 'master' into for-2.6.31 ...

Conflicts:
	drivers/block/hd.c
	drivers/block/mg_disk.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

2009-05-22 20:25:34 +02:00

..

include/mach

Merge branch 'omap-clock-fixes' into omap-fixes

2009-04-24 09:56:16 -07:00

clock.c

OMAP2xxx clock: pre-initialize struct clks early

2009-04-22 19:48:53 -06:00

common.c

clocksource: pass clocksource to read() callback

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

cpu-omap.c

[ARM] OMAP2: Implement CPUfreq frequency table based on PRCM table

2009-02-08 17:50:28 +00:00

debug-devices.c

ARM: OMAP: Switch to gpio_request/free calls

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

debug-leds.c

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

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

devices.c

ARM: OMAP3: mmc-twl4030 init passes device nodes back, v2

2009-03-23 18:51:22 -07:00

dma.c

ARM: OMAP: Fix for possible race condition in omap_free_dma()

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

dmtimer.c

OMAP2/3 GPTIMER: allow system tick GPTIMER to be changed in board-*.c files

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

fb.c

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

gpio.c

ARM: OMAP3: Fixed spurious IRQ issue for GPIO interrupts

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

i2c.c

ARM: OMAP: Add method to register additional I2C busses on the command line, v2

2009-03-23 18:51:20 -07:00

io.c

ARM: OMAP3: Add minimal omap3430 support

2008-10-09 17:51:41 +03:00

Kconfig

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel

2009-03-25 18:31:35 +00:00

mailbox.c

block: implement and enforce request peek/start/fetch

2009-05-11 09:52:18 +02:00

Makefile

ARM: OMAP: Allow I2C bus driver to be compiled as a module

2009-03-04 10:07:41 -08:00

mcbsp.c

[ARM] omap: mcbsp: convert to use fck/ick clocks directly

2009-02-08 17:50:19 +00:00

mux.c

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

ocpi.c

[ARM] Convert asm/io.h to linux/io.h

2008-09-06 12:10:45 +01:00

sram.c

[OMAP850] Changes to memory subsystem

2009-03-23 18:51:19 -07:00

usb.c

ARM: OMAP: get rid of OMAP_TAG_USB, v2

2009-03-23 18:51:20 -07:00