1
0
Fork 0
alistair23-linux/arch/alpha
Ingo Molnar 82268da1b1 Merge branch 'linus' into percpu-cpumask-x86-for-linus-2
Conflicts:
	arch/sparc/kernel/time_64.c
	drivers/gpu/drm/drm_proc.c

Manual merge to resolve build warning due to phys_addr_t type change
on x86:

	drivers/gpu/drm/drm_info.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-03-28 04:26:01 +01:00
..
boot inflate: refactor inflate malloc code 2008-07-25 10:53:28 -07:00
include/asm Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-03-26 16:11:41 -07:00
kernel Merge branch 'linus' into percpu-cpumask-x86-for-linus-2 2009-03-28 04:26:01 +01:00
lib remove __attribute_used__ 2008-01-28 23:21:18 +01:00
math-emu alpha: fix conversion from denormal float to double 2008-01-17 15:38:59 -08:00
mm alpha: fix typo in recent early vmalloc change 2009-03-01 16:03:16 +09:00
oprofile oprofile: more whitespace fixes 2008-10-15 20:55:51 +02:00
Kconfig alpha: use syscall wrappers 2009-01-29 18:04:44 -08:00
Kconfig.debug alpha/parisc: remove config variable DEBUG_RWLOCK 2008-02-06 10:41:03 -08:00
Makefile alpha: link failure fix 2008-06-20 16:46:10 -07:00
defconfig alpha/parisc: remove config variable DEBUG_RWLOCK 2008-02-06 10:41:03 -08:00