From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Sep 2009 22:37:02 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c37efa932598de5e30330a1414e34d9e082e0d9e;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge git://git./linux/kernel/git/sam/kbuild-next

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next: (30 commits)
  Use macros for .data.page_aligned section.
  Use macros for .bss.page_aligned section.
  Use new __init_task_data macro in arch init_task.c files.
  kbuild: Don't define ALIGN and ENTRY when preprocessing linker scripts.
  arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0
  kbuild: add static to prototypes
  kbuild: fail build if recordmcount.pl fails
  kbuild: set -fconserve-stack option for gcc 4.5
  kbuild: echo the record_mcount command
  gconfig: disable "typeahead find" search in treeviews
  kbuild: fix cc1 options check to ensure we do not use -fPIC when compiling
  checkincludes.pl: add option to remove duplicates in place
  markup_oops: use modinfo to avoid confusion with underscored module names
  checkincludes.pl: provide usage helper
  checkincludes.pl: close file as soon as we're done with it
  ctags: usability fix
  kernel hacking: move STRIP_ASM_SYMS from General
  gitignore usr/initramfs_data.cpio.bz2 and usr/initramfs_data.cpio.lzma
  kbuild: Check if linker supports the -X option
  kbuild: introduce ld-option
  ...

Fix trivial conflict in scripts/basic/fixdep.c
---

c37efa932598de5e30330a1414e34d9e082e0d9e
diff --cc scripts/basic/fixdep.c
index 8ab448611680,d7c1b04791f7..6bf21f83837d
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@@ -124,7 -125,8 +124,7 @@@ char *target
  char *depfile;
  char *cmdline;
  
- void usage(void)
+ static void usage(void)
 -
  {
  	fprintf(stderr, "Usage: fixdep <depfile> <target> <cmdline>\n");
  	exit(1);