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)
commit20a52d4f5998f4804af7c27651490647da62fd08
treea80fd0cfef1f819ecfd476413297f6324bec66e2
parent339a2afcaafb16d6a07a859d7cc6078f9bfeca91
parent58f915a311c1eac464e0e1caca2f85a05b66c930
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:
  nconfig: Fix segfault when help contains special characters
  kbuild: Fix make rpm
  kbuild: Make the setlocalversion script POSIX-compliant