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
..
boot	arch/sparc/boot/*.c: Mark various internal functions static	2009-11-15 15:01:40 -08:00
configs	sparc: Update defconfigs.	2010-03-03 02:55:24 -08:00
include/asm	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
kernel	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
lib	sparc: Stop trying to be so fancy and use __builtin_{memcpy,memset}()	2009-12-10 23:32:10 -08:00
math-emu	sparc: Add alignment and emulation fault perf events.	2009-12-11 01:07:53 -08:00
mm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6	2010-03-02 07:56:44 -08:00
oprofile	sparc: using HZ needs an include of linux/param.h	2009-10-05 00:46:08 -07:00
prom	sparc64: Make prom entry spinlock NMI safe.	2010-03-03 09:06:03 -08:00
Kconfig	sparc: convert to arch_gettimeoffset()	2010-01-15 01:34:28 -08:00
Kconfig.debug	sparc: Use __builtin_object_size() to validate the buffer size for copy_from_user()	2009-12-10 23:05:23 -08:00
Makefile	sparc: Set UTS_MACHINE correctly.	2009-12-05 17:17:55 -08:00