Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuil...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jun 2010 14:05:02 +0000 (07:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 27 Jun 2010 14:05:02 +0000 (07:05 -0700)
commitb14db7abe3501524fd2b1b4ab328239cde42f567
tree21c57dd8b05a4db3dcdff2b1d62049e0bdb43aaf
parent02c646ef4e9040aa538fa6ed22bb3fb502df5a77
parentd5eda75f3a6a08f5a3644764a88d288e62e7823d
Merge branch 'rc-fixes' of git://git./linux/kernel/git/mmarek/kbuild-2.6

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  kbuild: fix LOCALVERSION handling to match description
  kbuild: Fix modpost segfault
Makefile