Merge branch 'ctrl-mbr'
authorH. Peter Anvin <hpa@zytor.com>
Sat, 4 Apr 2009 22:33:29 +0000 (15:33 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Sat, 4 Apr 2009 22:33:29 +0000 (15:33 -0700)
commit5ca566c49a54e095042f607e1a6d29a74f344302
tree400ea996b5969a976acf3372962509a752355312
parent390a4bf409a4574fe3272adf9f873ef78b78c167
parentf7b5a2254ab7c8aa87679c1b731d2ea285c22e80
Merge branch 'ctrl-mbr'