Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ... Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c		2010-03-08 16:55:37 +01:00
..
init.c	[CRIS] Move header files from include to arch/cris/include.	2008-10-29 17:29:44 +01:00
intmem.c	CRIS v32: Fix bug in internal memory allocator mm/intmem.c	2008-02-08 11:06:36 +01:00
l2cache.c	CRIS v32: Add L2 cache initialization code.	2008-02-08 11:06:23 +01:00
Makefile	CRIS v32: Whitespace and formatting changes for kernel/ptrace.c	2008-02-08 11:06:24 +01:00
mmu.S	percpu: remove per_cpu__ prefix.	2009-10-29 22:34:15 +09:00
tlb.c	tree-wide: Assorted spelling fixes	2010-02-09 11:13:56 +01:00