Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Apr 2009 14:42:25 +0000 (07:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Apr 2009 14:42:25 +0000 (07:42 -0700)
* 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."


Trivial merge