diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 10:30:21 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 10:30:21 -0700 | 
| commit | cab4e4c43f92582a2bfc026137b3d8a175bd0360 (patch) | |
| tree | 2f0e8fbc2e7d2d0cd6f1658a5e084a53b1e83a2e /arch/um/kernel/syscall.c | |
| parent | 5412b5399e095730008a14f2107331b2123733e4 (diff) | |
| parent | 49502677e11079c2e3e01867c922a894ce06a8be (diff) | |
| download | olio-linux-3.10-cab4e4c43f92582a2bfc026137b3d8a175bd0360.tar.xz olio-linux-3.10-cab4e4c43f92582a2bfc026137b3d8a175bd0360.zip  | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param:
  module: use strstarts()
  strstarts: helper function for !strncmp(str, prefix, strlen(prefix))
  arm: allow usage of string functions in linux/string.h
  module: don't use stop_machine on module load
  module: create a request_module_nowait()
  module: include other structures in module version check
  module: remove the SHF_ALLOC flag on the __versions section.
  module: clarify the force-loading taint message.
  module: Export symbols needed for Ksplice
  Ksplice: Add functions for walking kallsyms symbols
  module: remove module_text_address()
  module: __module_address
  module: Make find_symbol return a struct kernel_symbol
  kernel/module.c: fix an unused goto label
  param: fix charp parameters set via sysfs
Fix trivial conflicts in kernel/extable.c manually.
Diffstat (limited to 'arch/um/kernel/syscall.c')
0 files changed, 0 insertions, 0 deletions