Merge git://github.com/rustyrussell/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Oct 2011 12:39:47 +0000 (14:39 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Oct 2011 12:39:47 +0000 (14:39 +0200)
* git://github.com/rustyrussell/linux:
  params: make dashes and underscores in parameter names truly equal
  kmod: prevent kmod_loop_msg overflow in __request_module()


Trivial merge