Tejun Heo 32032df6c2 Merge branch 'master' into percpu ... Conflicts: arch/powerpc/platforms/pseries/hvCall.S include/linux/percpu.h		2010-01-05 09:17:33 +09:00
..
boot	arch/sparc/boot/*.c: Mark various internal functions static	2009-11-15 15:01:40 -08:00
configs	sparc: Update defconfigs.	2009-09-16 00:31:26 -07:00
include/asm	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2009-12-17 08:31:01 -08:00
kernel	Merge branch 'master' into percpu	2010-01-05 09:17:33 +09: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	sparc: use bitmap_find_next_zero_area	2009-12-16 07:20:19 -08:00
oprofile	sparc: using HZ needs an include of linux/param.h	2009-10-05 00:46:08 -07:00
prom	sparc64: Fix bootup with mcount in some configs.	2009-09-04 03:39:45 -07:00
Kconfig	sparc64: Add syscall tracepoint support.	2009-12-11 00:44:47 -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