]> git.karo-electronics.de Git - mv-sheeva.git/commit - arch/m68knommu/kernel/asm-offsets.c
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)
commit2301b65b86df8b80e6779ce9885ad62a5c4adc38
treed61f1b25629e08ee40d1ddec629d7caa67eb7c44
parente596c79050eafea89cf9fe26b7a807643a2a9904
parentc2d5a7300da667d090c8fe79f05404c9fb205b12
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
scripts/package/mkspec