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

..

boot

inflate: refactor inflate malloc code

2008-07-25 10:53:28 -07:00

drivers

Merge branch 'linus' into core/generic-dma-coherent

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

kernel

cris: use the common ascii hex helpers

2008-07-26 12:00:05 -07:00

lib

cris: correct usage of __user for copy to and from user space in lib/usercopy and uaccess.h

2008-03-04 16:35:16 -08:00

mach-a3

CRIS v32: Correct spelling of bandwidth in function name.

2008-02-08 11:16:46 +01:00

mach-fs

CRIS v32: Update vcs_hook.c for ETRAX FS.

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

mm

mm: drop unneeded pgdat argument from free_area_init_node()

2008-07-24 10:47:16 -07:00

Kconfig

CRIS: Rearrange Kconfigs for v10 and v32 to allow compilation without warnings.

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

output_arch.ld

…

vmlinux.lds.S

CRIS v32: Fix startup oops and replace hardcoded pagesize in vmlinux.lds.S

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