From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 28 Mar 2012 21:27:09 +0000 (-0700)
Subject: Merge git://github.com/rustyrussell/linux
X-Git-Tag: MMI-PSA29.97-13-9~17142
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d25413efa9536e2f425ea45c7720598035c597bc;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge git://github.com/rustyrussell/linux

Pull module and param updates from Rusty Russell:
 "I'm getting married next week, and then honeymoon until 6th May.  I'll
  be offline from next week, except to post the compulsory pictures if
  Alex shaves her head..."

I'm sure Rusty can take time off from his honeymoon if something comes
up. And here's the explanation about head shaving:

	http://baldalex.org/

in case you wondered and wanted to support another insane caper or
Rusty's involving shaving.

What *is* it with Rusty and shaving, anyway?

* git://github.com/rustyrussell/linux:
  module: Remove module size limit
  module: move __module_get and try_module_get() out of line.
  params: <level>_initcall-like kernel parameters
  module_param: remove support for bool parameters which are really int.
  module: add kernel param to force disable module load
---

d25413efa9536e2f425ea45c7720598035c597bc