Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Jan 2011 16:28:38 +0000 (08:28 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Jan 2011 16:28:38 +0000 (08:28 -0800)
* 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  deb-pkg: s/hdr/kernel_headers_/ && s/header/libc_headers_/
  deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb
  kbuild: create linux-headers package in deb-pkg
  kbuild, deb-pkg: support overriding userland architecture
  kbuild, deb-pkg: select userland architecture based on UTS_MACHINE
  kbuild, deb-pkg: Fix build with paranoid umask


Trivial merge