Merge remote-tracking branch 'origin/master' into elflink
commit69cbdc141accd08e7d082f359de71ab5c5c2760a
authorH. Peter Anvin <hpa@zytor.com>
Wed, 27 Jun 2012 15:03:55 +0000 (27 08:03 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 27 Jun 2012 15:03:55 +0000 (27 08:03 -0700)
treec9283e97631ed72fd24f7dd498187741f9ecbdd8
parent172261b8d33c33709019ed5635c5c6452295af17
parent2a2fd4f65be041d467532c0f19325978dbda7a5b
Merge remote-tracking branch 'origin/master' into elflink