Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuil...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 Jul 2010 02:55:23 +0000 (19:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 5 Jul 2010 02:55:23 +0000 (19:55 -0700)
commit404504470177d5ca1b46db5197ee0b78d639a2eb
treefe589d5017b199094920decd8283f748c4d668be
parent123f94f22e3d283dfe68742b269c245b0501ad82
parent62052be3a797f26f6f0fe30fc8d7f40ab54e08fd
Merge branch 'rc-fixes' of git://git./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
Makefile