Merge tag 'for-linus' of git://github.com/rustyrussell/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Feb 2012 05:02:07 +0000 (21:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Feb 2012 05:02:07 +0000 (21:02 -0800)
* tag 'for-linus' of git://github.com/rustyrussell/linux:
  mod/file2alias: make modpost compile on darwin again


Trivial merge