Merge git://github.com/rustyrussell/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Nov 2011 01:28:32 +0000 (17:28 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Nov 2011 01:28:32 +0000 (17:28 -0800)
commitd4a2e61f0b7a7b5b9e321e776a1e874c02e847e4
treed90b71a99cb82809d56f9798f59d175b57562803
parent0e4c9dc2f2e0fb6d3838eba34382fc6d2d1c381c
parent2449b8ba0745327c5fa49a8d9acffe03b2eded69
Merge git://github.com/rustyrussell/linux

* git://github.com/rustyrussell/linux:
  module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree
  module: Enable dynamic debugging regardless of taint