Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuil...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Jul 2010 20:25:00 +0000 (13:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Jul 2010 20:25:00 +0000 (13:25 -0700)
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  nconfig: Fix segfault when help contains special characters
  kbuild: Fix make rpm
  kbuild: Make the setlocalversion script POSIX-compliant


Trivial merge