Merge r67713 and r67936 (Eric's parport driver) from trunk
authorColin Finck <colin@reactos.org>
Thu, 16 Jul 2015 15:12:50 +0000 (15:12 +0000)
committerColin Finck <colin@reactos.org>
Thu, 16 Jul 2015 15:12:50 +0000 (15:12 +0000)
commit30af6277610c4c60a6a8ac12548fce4ef81259d8
tree577452219777c72210ec8b922ed70a9446adde08
parentba2134dd1e70c2d457eba507884280f10a87595d
parenta84978c6585416285431de0489661d8fdc7b6cab
parentf4494b1b46d2259d8813564a992b81c3a9aced30
Merge r67713 and r67936 (Eric's parport driver) from trunk

svn path=/branches/colins-printing-for-freedom/; revision=68406