Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
	ChangeLog

diff --cc ChangeLog
index f1b1c0d,98661dc..01d8905
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,8 +1,14 @@@
 +2011-09-09  Ulrich Drepper  <drepper@gmail.com>
 +
 +      [BZ #12847]
 +      * libio/genops.c (INTDEF): For string streams the _lock pointer can
 +      be NULL.  Don't lock in this case.
 +
+ 2011-09-09  Roland McGrath  <roland@hack.frob.com>
+ 
+       * elf/elf.h (ELFOSABI_GNU): New macro.
+       (ELFOSABI_LINUX): Define to that.
+ 
  2011-07-29  Denis Zaitceff  <zaitceff@gmail.com>
  
        * string/strncat.c (strncat): Undef the symbol in case it has been

diff --cc stdio-common/vfscanf.c
index 7356eeb,7356eeb..9d312d5
--- 1/stdio-common/vfscanf.c
--- 2/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@@ -1,4 -1,4 +1,4 @@@
--/* Copyright (C) 1991-2006, 2007, 2010 Free Software Foundation, Inc.
++/* Copyright (C) 1991-2006, 2007, 2010, 2011 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
  
     The GNU C Library is free software; you can redistribute it and/or
@@@ -48,7 -48,7 +48,7 @@@
  #if INT_MAX == LONG_MAX
  # define need_long    0
  #else
--# define need_long    1
++# define need_long    1
  #endif
  
  /* Those are flags in the conversion format. */
@@@ -102,9 -102,9 +102,9 @@@
  # define __strtof_internal    __wcstof_internal
  
  # define L_(Str)      L##Str
--# define CHAR_T               wchar_t
++# define CHAR_T               wchar_t
  # define UCHAR_T      unsigned int
--# define WINT_T               wint_t
++# define WINT_T               wint_t
  # undef EOF
  # define EOF          WEOF
  #else
@@@ -128,7 -128,7 +128,7 @@@
                            return EOF
  
  # define L_(Str)      Str
--# define CHAR_T               char
++# define CHAR_T               char
  # define UCHAR_T      unsigned char
  # define WINT_T               int
  #endif