tree b385f49a07e92f5080c8e7219d888935ed46cc80
parent 0b80e3adc289de13cc70b33d90812ef136b6ea01
parent 75bccd881a49d2da796ec0852158f957dc023f61
author Linus Torvalds <torvalds@linux-foundation.org> 1236900926 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1236900926 -0700

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()