052034be14b
parent 3401a61e16a5b852d4e353c8850c857105a67a9c
author Linus Torvalds <torvalds@linux-foundation.org> 1211555599 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1211555599 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  stop_machine: make stop_machine_run more virtualization friendly
  doc: add a chapter about trylock functions [Bug 9011]
  modules: proper cleanup of kobject without CONFIG_SYSFS
  module loading ELF handling: use SELFMAG instead of numeric constant