Tejun Heo c43768cbb7 Merge branch 'master' into for-next ... Pull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix changes. As alpha in percpu tree uses 'weak' attribute instead of inline assembly, there's no need for __used attribute. Conflicts: arch/alpha/include/asm/percpu.h arch/mn10300/kernel/vmlinux.lds.S include/linux/percpu-defs.h		2009-07-04 07:13:18 +09:00
..
boot	Merge commit 'kumar/next' into merge	2009-06-26 16:58:01 +10:00
configs	Merge commit 'origin/master' into next	2009-06-17 10:24:53 +10:00
include/asm	Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-30 19:02:59 -07:00
kernel	Merge branch 'master' into for-next	2009-07-04 07:13:18 +09:00
kvm	powerpc: Add configurable -Werror for arch/powerpc	2009-06-16 14:15:45 +10:00
lib	powerpc: Add configurable -Werror for arch/powerpc	2009-06-16 14:15:45 +10:00
math-emu	powerpc/math-emu: Fix efp dependence	2009-03-11 06:00:08 -05:00
mm	Merge branch 'master' into for-next	2009-07-04 07:13:18 +09:00
oprofile	powerpc: Add configurable -Werror for arch/powerpc	2009-06-16 14:15:45 +10:00
platforms	Merge branch 'master' into for-next	2009-07-04 07:13:18 +09:00
sysdev	Merge commit 'kumar/next' into merge	2009-06-26 16:58:01 +10:00
xmon	powerpc: Add configurable -Werror for arch/powerpc	2009-06-16 14:15:45 +10:00
Kconfig	Merge branch 'master' into for-next	2009-07-04 07:13:18 +09:00
Kconfig.debug	powerpc: Add configurable -Werror for arch/powerpc	2009-06-16 14:15:45 +10:00
Makefile	powerpc: Move VMX and VSX asm code to vector.S	2009-06-09 16:46:25 +10:00