Jens Axboe 9bd7de51ee Merge branch 'master' into for-2.6.31 ... Conflicts: drivers/ide/ide-io.c Signed-off-by: Jens Axboe <jens.axboe@oracle.com>		2009-05-22 20:28:35 +02:00
..
include/mach	Merge branch 'omap-clock-fixes' into omap-fixes	2009-04-24 09:56:16 -07:00
clock.c
common.c
cpu-omap.c
debug-devices.c
debug-leds.c
devices.c
dma.c
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: OMAP: Fix printing of reserved memory for frambuffer	2009-05-11 09:58:19 -07:00
gpio.c	ARM: OMAP3: Fix number of GPIO lines for 34xx	2009-05-16 08:28:16 -07:00
i2c.c
io.c
Kconfig
mailbox.c	block: implement and enforce request peek/start/fetch	2009-05-11 09:52:18 +02:00
Makefile
mcbsp.c
mux.c
ocpi.c
sram.c
usb.c