From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Feb 2012 00:59:53 +0000 (-0800)
Subject: Merge tag 'for-linus' of git://github.com/rustyrussell/linux
X-Git-Tag: firefly_0821_release~3680^2~3537
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e3f89f4ae4ea0227d49ff1cc1276ef04b2749ed2;p=firefly-linux-kernel-4.4.55.git

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
---

e3f89f4ae4ea0227d49ff1cc1276ef04b2749ed2