From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Jul 2010 20:25:00 +0000 (-0700)
Subject: Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuil... 
X-Git-Tag: v2.6.35~43
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=20a52d4f5998f4804af7c27651490647da62fd08;p=~emulex%2Finfiniband.git

Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/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
---

20a52d4f5998f4804af7c27651490647da62fd08