git://ftp.safe.ca / safe / jmp / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1a8dd30 746a99a)
Merge branch 'master' into for-next
authorTejun Heo <tj@kernel.org>
Fri, 3 Jul 2009 22:13:18 +0000 (07:13 +0900)
committerTejun Heo <tj@kernel.org>
Fri, 3 Jul 2009 22:13:18 +0000 (07:13 +0900)
commitc43768cbb7655ea5ff782ae250f6e2ef4297cf98
tree3982e41dde3eecaa3739a5d1a8ed18d04bd74f01tree | snapshot
parent1a8dd307cc0a2119be4e578c517795464e6dabbacommit | diff
parent746a99a5af60ee676afa2ba469ccd1373493c7e7commit | diff
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
16 files changed:
Makefile diff1 | diff2 | blob | history
arch/arm/kernel/vmlinux.lds.S diff1 | diff2 | blob | history
arch/mn10300/kernel/vmlinux.lds.S diff1 | diff2 | blob | history
arch/powerpc/Kconfig diff1 | diff2 | blob | history
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/kernel/cpu/mcheck/mce.c diff1 | diff2 | blob | history
arch/x86/kernel/cpu/perf_counter.c diff1 | diff2 | blob | history
block/cfq-iosched.c diff1 | diff2 | blob | history
include/asm-generic/vmlinux.lds.h diff1 | diff2 | blob | history
include/linux/percpu-defs.h diff1 | diff2 | blob | history
init/main.c diff1 | diff2 | blob | history
kernel/perf_counter.c diff1 | diff2 | blob | history
kernel/trace/trace_events.c diff1 | diff2 | blob | history
lib/Kconfig.debug diff1 | diff2 | blob | history
mm/page-writeback.c diff1 | diff2 | blob | history
mm/slub.c diff1 | diff2 | blob | history
Full containers within linux kernel