From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 Apr 2009 14:42:25 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~26799
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a01da1d0f643142fa6845eb3bd14daab8ce7bea5;p=mirror_ubuntu-artful-kernel.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param:
  Revert "module: remove the SHF_ALLOC flag on the __versions section."
---

a01da1d0f643142fa6845eb3bd14daab8ce7bea5