Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 24 Aug 2005 03:00:17 +0000 (20:00 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 24 Aug 2005 03:00:17 +0000 (20:00 -0700)
commit005940ead619c2867e0465c8e0fffb9e5989b57e
treec4610404433dc2d38389100f45c5d824d2713750
parentd3813fcf105814d06b47fa586f6b61f3cff1cefc
parent6885433c25aaca2cb13ee52a94be156163d6aa23
Merge head 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev