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)
commit2355e4290336fcda4b4a799448f745155a000226
tree81814353573f5a47ac8f96d75221cfee46a0f92c
parente33bae14fd8da449d735552d78e6dd33ece0458c
parentb1e4d20cbf2ef8e27515da032b95fdcbb5b06bf1
Merge git://github.com/rustyrussell/linux

* git://github.com/rustyrussell/linux:
  params: make dashes and underscores in parameter names truly equal
  kmod: prevent kmod_loop_msg overflow in __request_module()