Merge commit 'origin/master' into fedora/master

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 14fbf5110488086a663a2cc03589d257a8aad83c,0c6c36f472f610aee07796f8ddbd1274527e49c5..69edfd237e933b779d49aaace3b5156ee1d3529e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,26 +1,36 @@@
+ 2009-07-01  Ulrich Drepper  <drepper@redhat.com>
+ 
+       * nis/nss_nis/nis-network.c (_nss_nis_getnetbyaddr_r): Don't use
+       inet_makeaddr.  This worked only with class-based networks.
+       * nis/nss_nisplus/nisplus-network.c (_nss_nisplus_getnetbyaddr_r):
+       Likewise.
+ 
+       * nss/nss_files/files-network.c (netbyaddr): If type is AF_UNSPEC,
+       recognize all types.
+       * nss/getent.c (networks_keys): Pass AF_UNSPEC instead of AF_UNIX
+       to getnetbyaddr.  Fix network parameter to getnetbyaddr.  It must
+       be in host byte order.
+ 
+ 2009-06-26  H.J. Lu  <hongjiu.lu@intel.com>
+ 
+       * sysdeps/x86_64/multiarch/ifunc-defines.sym (FAMILIY_OFFSET): Define.
+       (MODEL_OFFSET): Define.
+       * sysdeps/x86_64/multiarch/init-arch.h (cpu_features): Add
+       family and model.
+       * sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features): Break
+       out common code into new function get_common_indeces. Determine
+       extended family and model for Intel processors.
+ 
 +2009-06-26  Andreas Schwab  <aschwab@redhat.com>
 +
 +      * timezone/zic.c (stringzone): Don't try to generate a POSIX TZ
 +      string when the timezone ends in DST.
 +
 +      * sysdeps/powerpc/powerpc32/____longjmp_chk.S (CHECK_SP): Save lr
 +      before call.
 +      * sysdeps/powerpc/powerpc64/____longjmp_chk.S (CHECK_SP):
 +      Likewise.
 +
  2009-06-26  Ulrich Drepper  <drepper@redhat.com>
  
        * resolv/resolv.h: Define RES_SNGLKUPREOP.