From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 5 Jul 2010 02:55:23 +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-rc4~7
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=404504470177d5ca1b46db5197ee0b78d639a2eb

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:
  kbuild: Propagate LOCALVERSION= down to scripts/setlocalversion
  kbuild: Clean up and speed up the localversion logic
---

404504470177d5ca1b46db5197ee0b78d639a2eb