Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Apr 2008 21:03:54 +0000 (14:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Apr 2008 21:03:54 +0000 (14:03 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
  kbuild: scripts/Makefile.modpost typo fix
  kbuild: soften MODULE_LICENSE check


Trivial merge