Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 23:19:38 +0000 (16:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 23:19:38 +0000 (16:19 -0700)
* 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  scripts/package: don't break if %{_smp_mflags} isn't set
  kbuild, deb-pkg: Check if KBUILD_IMAGE exists before copying it

1  2 
scripts/package/mkspec

Simple merge