From: Alan Modra <amodra@gmail.com>
Date: Sun, 6 Oct 2013 23:23:41 +0000 (+1030)
Subject: Fix careless merge.
X-Git-Tag: upstream/2.30~8554
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ec1b13d0162034464202b06d81b9daa9fe840e7;p=external%2Fglibc.git

Fix careless merge.
---

diff --git a/ChangeLog b/ChangeLog
index 6f48dc4..44ebf72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-07  Alan Modra  <amodra@gmail.com>
+
+	* README: Fix careless merge.
+
 2013-10-05  Alan Modra  <amodra@gmail.com>
 
 	* NEWS: Mention powerpc64le support and bugs fixed.
diff --git a/README b/README
index 96dd6f6..0999fcf 100644
--- a/README
+++ b/README
@@ -26,7 +26,7 @@ The GNU C Library supports these configurations for using Linux kernels:
 
 	i[4567]86-*-linux-gnu
 	x86_64-*-linux-gnu	Can build either x86_64 or x32
-	powerpc-*-linux-gnu	Hardware floating point required, BE only.
+	powerpc-*-linux-gnu	Hardware or software floating point, BE only.
 	powerpc64*-*-linux-gnu	Big-endian and little-endian.
 	s390-*-linux-gnu
 	s390x-*-linux-gnu