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
..
alpha	Merge branch 'linus' into percpu-cpumask-x86-for-linus-2	2009-03-28 04:26:01 +01:00
arm	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
avr32	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
blackfin	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
cris	Merge branch 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-03-26 16:06:50 -07:00
frv
h8300	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
ia64	Merge branch 'linus' into percpu-cpumask-x86-for-linus-2	2009-03-28 04:26:01 +01:00
m32r
m68k	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2009-03-26 16:15:31 -07:00
m68knommu	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-03-26 15:23:24 -07:00
mips	Merge branch 'linus' into percpu-cpumask-x86-for-linus-2	2009-03-28 04:26:01 +01:00
mn10300	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
parisc	Merge branch 'linus' into percpu-cpumask-x86-for-linus-2	2009-03-28 04:26:01 +01:00
powerpc	Merge branch 'linus' into percpu-cpumask-x86-for-linus-2	2009-03-28 04:26:01 +01:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2009-03-27 16:23:12 -07:00
sh	Merge branch 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-03-26 16:06:50 -07:00
sparc	Merge branch 'linus' into percpu-cpumask-x86-for-linus-2	2009-03-28 04:26:01 +01:00
um	uml: convert network device to netdevice ops	2009-03-27 00:46:40 -07:00
x86	Merge branch 'linus' into percpu-cpumask-x86-for-linus-2	2009-03-28 04:26:01 +01:00
xtensa	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
.gitignore
Kconfig