tree 51808763ac9f7e203d369584a45b61eece9bc2a4
parent 44d84afa834b799560d7dbe47250ad7557f5ca2f
parent 2e45e77787c9d0720b046eb69856edf43b17e33e
author Linus Torvalds <torvalds@linux-foundation.org> 1239115345 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1239115345 -0700

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