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)
commitf6bd5798f3b7583f7e984f8408ffb5b36ece174f
tree7322b8d1903d653c2d687577b0d9137ad2d1ee8d
parentf694fc9729a12094cd0cef8b0c765071972865c8
parentdd2a3acaecd7abb2d43b09a823cf2e4c967fa2ac
Merge tag 'for-linus' of git://github.com/rustyrussell/linux

* tag 'for-linus' of git://github.com/rustyrussell/linux:
  mod/file2alias: make modpost compile on darwin again