Dimitry Andric 9d9a79e53d Repair a few minor mismerges from r262261 in the clang-sparc64 project
branch.  This is also to minimize differences with upstream.

MFC after:	3 weeks
X-MFC-With:	r262613
2014-03-10 21:58:38 +00:00
..
2014-02-16 21:53:33 +00:00
2014-01-27 17:47:21 +00:00
2013-09-24 14:52:43 +00:00
2014-01-05 23:28:03 +00:00
2014-02-21 16:14:40 +00:00
2013-05-21 19:23:49 +00:00
2013-09-22 20:30:55 +00:00
2014-03-10 10:39:29 +00:00
2014-02-01 09:27:57 +00:00
2013-11-15 22:45:14 +00:00
2013-01-03 07:25:30 +00:00
2014-01-29 19:28:52 +00:00
2014-02-20 19:48:47 +00:00
2013-12-21 12:45:35 +00:00
2014-03-02 03:34:06 +00:00
2013-12-16 01:58:12 +00:00
2013-12-19 20:19:57 +00:00
2013-09-24 09:56:58 +00:00
2014-03-04 21:51:11 +00:00