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

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  initramfs: Fix build break on symbol-prefixed archs
  initramfs: fix initramfs size calculation
  initramfs: generalize initramfs_data.xxx.S variants
  scripts/kallsyms: Enable error messages while hush up unnecessary warnings
  scripts/setlocalversion: update comment
  kbuild: Use a single clean rule for kernel and external modules
  kbuild: Do not run make clean in $(srctree)
  scripts/mod/modpost.c: fix commentary accordingly to last changes
  kbuild: Really don't clean bounds.h and asm-offsets.h

diff --cc Documentation/kbuild/makefiles.txt
Simple merge

diff --cc Kbuild
Simple merge

diff --cc Makefile
Simple merge

diff --cc include/asm-generic/vmlinux.lds.h
index 2c0fc10,0c6387d..bd69d79
--- 1/include/asm-generic/vmlinux.lds.h
--- 2/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@@ -637,10 -630,11 +637,11 @@@
  
  #ifdef CONFIG_BLK_DEV_INITRD
  #define INIT_RAM_FS                                                   \
 -      . = ALIGN(PAGE_SIZE);                                           \
 +      . = ALIGN(4);                                                   \
        VMLINUX_SYMBOL(__initramfs_start) = .;                          \
        *(.init.ramfs)                                                  \
-       VMLINUX_SYMBOL(__initramfs_end) = .;
+       . = ALIGN(8);                                                   \
+       *(.init.ramfs.info)
  #else
  #define INIT_RAM_FS
  #endif

diff --cc init/initramfs.c
Simple merge

diff --cc scripts/Makefile.lib
Simple merge

diff --cc scripts/mod/modpost.c
index 1ec7158,859bee4..33122ca
--- 1/scripts/mod/modpost.c
--- 2/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@@ -1230,9 -1218,9 +1233,9 @@@ static char *sec2annotation(const char 
                        strcat(p, "data ");
                else
                        strcat(p, " ");
-               return r; /* we leak her but we do not care */
+               return r;
        } else {
 -              return "";
 +              return strdup("");
        }
  }
  

diff --cc scripts/setlocalversion
Simple merge