From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Mar 2009 23:35:26 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
X-Git-Tag: v2.6.29-rc8~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9ead64974b05501bbac0d63a47c99fa786d064ba;p=~shefty%2Frdma-dev.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
  kbuild: remove unused -r option for module-init-tool depmod
  kbuild: fix 'make rpm' when CONFIG_LOCALVERSION_AUTO=y and using SCM tree
  kbuild: fix mkspec to cleanup RPM_BUILD_ROOT
  kbuild: fix C libary confusion in unifdef.c due to getline()
---

9ead64974b05501bbac0d63a47c99fa786d064ba