2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 10:44:14 +08:00
linux-next/arch/parisc
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
..
configs parisc: update defconfigs 2009-03-13 01:33:34 -04:00
hpux parisc: remove unused local out_putf label 2009-03-13 01:17:59 -04: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 parisc: lib/: make code static 2009-01-05 18:15:24 +00:00
math-emu kbuild: fix up CFLAGS usage 2007-10-14 21:49:42 +02:00
mm parisc: BUG_ON() cleanup 2009-03-13 01:16:35 -04:00
oprofile oprofile: more whitespace fixes 2008-10-15 20:55:51 +02:00
defpalo.conf Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
install.sh Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Kconfig cpumask: centralize cpu_online_map and cpu_possible_map 2008-12-13 21:19:41 +10:30
Kconfig.debug alpha/parisc: remove config variable DEBUG_RWLOCK 2008-02-06 10:41:03 -08:00
Makefile parisc: quiet palo not-found message from "which" 2009-01-05 19:10:34 +00:00
nm Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00