Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Mar 2009 23:35:26 +0000 (16:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Mar 2009 23:35:26 +0000 (16:35 -0700)
commit9ead64974b05501bbac0d63a47c99fa786d064ba
treeb385f49a07e92f5080c8e7219d888935ed46cc80
parent0b80e3adc289de13cc70b33d90812ef136b6ea01
parent75bccd881a49d2da796ec0852158f957dc023f61
Merge git://git./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()