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)
commita01da1d0f643142fa6845eb3bd14daab8ce7bea5
tree51808763ac9f7e203d369584a45b61eece9bc2a4
parent44d84afa834b799560d7dbe47250ad7557f5ca2f
parent2e45e77787c9d0720b046eb69856edf43b17e33e
Merge git://git./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."