Merge tag 'for-linus' of git://github.com/rustyrussell/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Feb 2012 00:59:53 +0000 (16:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Feb 2012 00:59:53 +0000 (16:59 -0800)
commite3f89f4ae4ea0227d49ff1cc1276ef04b2749ed2
treed75824dea7ee72a4b384f246f84dbf9aabab8a4b
parent3b582f393150c72b18339bc00d7ed4fb22445ed1
parent0d86f65ed0b727daa06d3aa176314cd175323db6
Merge tag 'for-linus' of git://github.com/rustyrussell/linux

* tag 'for-linus' of git://github.com/rustyrussell/linux:
  module: fix broken isapnp handling in file2alias
  module: make module param bint handle nul value