diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-08-25 12:49:19 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-08-25 12:49:19 +0200 |
commit | a4bcb42f32c0e8044c0ad2c409e10679f6cc3e35 (patch) | |
tree | d33c2c02b4e1fdaa7fed9f5923b5280df95c6b7e | |
parent | 7f9b4bb76bbe3c2f939c35cdab084873ed60dd7f (diff) | |
parent | d0cd7425fab774a480cce17c2f649984312d0b55 (diff) | |
parent | b7d460897739e02f186425b7276e3fdb1595cea7 (diff) |
Merge branches 'x86/bios' and 'x86/urgent' into auto-latest