From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Jun 2009 16:30:36 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=65d52cc9d47975f4fbd0a50e62f4a49be2c0514a;p=linux-beck.git

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: cleanup FIXME comments about trimming exception table entries.
  module: trim exception table on init free.
  module: merge module_alloc() finally
  uml module: fix uml build process due to this merge
  x86 module: merge the rest functions with macros
  x86 module: merge the same functions in module_32.c and module_64.c
  uvesafb: improve parameter handling.
  module_param: allow 'bool' module_params to be bool, not just int.
  module_param: add __same_type convenience wrapper for __builtin_types_compatible_p
  module_param: split perm field into flags and perm
  module_param: invbool should take a 'bool', not an 'int'
  cyber2000fb.c: use proper method for stopping unload if CONFIG_ARCH_SHARK
---

65d52cc9d47975f4fbd0a50e62f4a49be2c0514a