Merge branch 'x86/olpc'
commit4aa3273a2b2845d9a9a390bd8c366532f562d407
authorIngo Molnar <mingo@elte.hu>
Sun, 24 Jul 2011 18:16:16 +0000 (24 20:16 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 24 Jul 2011 18:16:16 +0000 (24 20:16 +0200)
treec0fac938e99b81237a8f4ad70e983d38cb7a9579
parent21c9ca0cdd21302a3f71fee2151ead1a17ae3cee
parent07d5b38e14b7ff98eb52e4a6db4e20abcc608da3
Merge branch 'x86/olpc'