From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Feb 2012 05:02:07 +0000 (-0800)
Subject: Merge tag 'for-linus' of git://github.com/rustyrussell/linux
X-Git-Tag: v3.3-rc6~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6bd5798f3b7583f7e984f8408ffb5b36ece174f;p=thirdparty%2Flinux.git

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

f6bd5798f3b7583f7e984f8408ffb5b36ece174f