Ingo Molnar cb28a1bbdb Merge branch 'linus' into core/generic-dma-coherent ...

Conflicts:

	arch/x86/Kconfig

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2008-07-29 00:07:55 +02:00

..

mach-a3

cris: cdev lock_kernel() pushdown

2008-05-18 15:43:40 -06:00

mach-fs

cris: cdev lock_kernel() pushdown

2008-05-18 15:43:40 -06:00

pci

Cris: convert to using generic dma-coherent mem allocator

2008-07-20 21:21:59 +02:00

axisflashmap.c

CRIS v32: Update and improve axisflashmap

2008-02-08 11:06:25 +01:00

cryptocop.c

Add a bunch of cycle_kernel_lock() calls

2008-06-20 14:05:53 -06:00

i2c.c

Add a bunch of cycle_kernel_lock() calls

2008-06-20 14:05:53 -06:00

i2c.h

CRIS v32: New version of I2C driver.

2008-02-08 11:06:25 +01:00

iop_fw_load.c

CRIS v32: Change include path for hwregs in drivers/iop_fw_load.c

2008-02-08 11:06:33 +01:00

Kconfig

Cris: convert to using generic dma-coherent mem allocator

2008-07-20 21:21:59 +02:00

Makefile

CRIS v32: Remove common gpio and nandflash, add mach-fs and mach-a3 as subdirs.

2008-02-08 11:06:26 +01:00

pcf8563.c

It looks at least odd to apply spin_unlock to a mutex.

2008-06-29 22:50:56 +02:00

sync_serial.c

cris: cdev lock_kernel() pushdown

2008-05-18 15:43:40 -06:00