tree d61f1b25629e08ee40d1ddec629d7caa67eb7c44
parent e596c79050eafea89cf9fe26b7a807643a2a9904
parent c2d5a7300da667d090c8fe79f05404c9fb205b12
author Linus Torvalds <torvalds@linux-foundation.org> 1288307978 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1288307978 -0700

Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

* '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