David S. Miller 47871889c6 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ...

Conflicts:
	drivers/firmware/iscsi_ibft.c

2010-02-28 19:23:06 -08:00

..

boot

arch/sparc/boot/*.c: Mark various internal functions static

2009-11-15 15:01:40 -08:00

configs

sparc64: Update defconfig.

2010-01-20 16:32:21 -08:00

include/asm

Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core

2010-02-27 10:06:10 +01:00

kernel

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2010-02-28 19:23:06 -08: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: Add missing SW perf fault events.

2010-01-20 16:23:03 -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

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