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

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

diff --combined Documentation/kbuild/kbuild.txt
index 1e5165aa9e4ef79eb007d39203524722aa7d21bb,b146eb86e498089373ec0c14aaefcdb38920177d..4a990317b84a7c60cac5b507a4efa682ca0ad4b7
--- 1/Documentation/kbuild/kbuild.txt
--- 2/Documentation/kbuild/kbuild.txt
+++ b/Documentation/kbuild/kbuild.txt
@@@ -22,33 -22,11 +22,33 @@@ building C files and assembler files
  
  KAFLAGS
  --------------------------------------------------
 -Additional options to the assembler.
 +Additional options to the assembler (for built-in and modules).
 +
 +AFLAGS_MODULE
 +--------------------------------------------------
 +Addtional module specific options to use for $(AS).
 +
 +AFLAGS_KERNEL
 +--------------------------------------------------
 +Addtional options for $(AS) when used for assembler
 +code for code that is compiled as built-in.
  
  KCFLAGS
  --------------------------------------------------
 -Additional options to the C compiler.
 +Additional options to the C compiler (for built-in and modules).
 +
 +CFLAGS_KERNEL
 +--------------------------------------------------
 +Addtional options for $(CC) when used to compile
 +code that is compiled as built-in.
 +
 +CFLAGS_MODULE
 +--------------------------------------------------
 +Addtional module specific options to use for $(CC).
 +
 +LDFLAGS_MODULE
 +--------------------------------------------------
 +Additional options used for $(LD) when linking modules.
  
  KBUILD_VERBOSE
  --------------------------------------------------
@@@ -62,17 -40,25 +62,25 @@@ Set the directory to look for the kerne
  modules.
  The directory can be specified in several ways:
  1) Use "M=..." on the command line
 -2) Environmnet variable KBUILD_EXTMOD
 -3) Environmnet variable SUBDIRS
 +2) Environment variable KBUILD_EXTMOD
 +3) Environment variable SUBDIRS
  The possibilities are listed in the order they take precedence.
  Using "M=..." will always override the others.
  
  KBUILD_OUTPUT
  --------------------------------------------------
  Specify the output directory when building the kernel.
 -The output directory can also be specificed using "O=...".
 +The output directory can also be specified using "O=...".
  Setting "O=..." takes precedence over KBUILD_OUTPUT.
  
+ KBUILD_DEBARCH
+ --------------------------------------------------
+ For the deb-pkg target, allows overriding the normal heuristics deployed by
+ deb-pkg. Normally deb-pkg attempts to guess the right architecture based on
+ the UTS_MACHINE variable, and on some architectures also the kernel config.
+ The value of KBUILD_DEBARCH is assumed (not checked) to be a valid Debian
+ architecture.
+ 
  ARCH
  --------------------------------------------------
  Set ARCH to the architecture to be built.
@@@ -112,7 -98,7 +120,7 @@@ The script will be called with the foll
      $3 - kernel map file
      $4 - default install path (use root directory if blank)
  
 -The implmentation of "make install" is architecture specific
 +The implementation of "make install" is architecture specific
  and it may differ from the above.
  
  INSTALLKERNEL is provided to enable the possibility to