Merge branch 'usbreset' into phcoder
commit0aa867834776a21f3ef1238ce06f8ebac1cbf065
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Thu, 16 Jul 2009 19:33:41 +0000 (16 21:33 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Thu, 16 Jul 2009 19:33:41 +0000 (16 21:33 +0200)
tree944db3c5c20885d51dbab4801802e87d9ade0cd8
parent3aad8356ce06fbf869dcdc8de58d11a6311134fc
parentb372d4f2a67605bcca1e4f3badbe0a17cd447d31
Merge branch 'usbreset' into phcoder

Conflicts:
ChangeLog
conf/i386-pc.rmk
ChangeLog
conf/i386-pc.rmk