Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 31 Jul 2005 23:48:39 +0000 (16:48 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 31 Jul 2005 23:48:39 +0000 (16:48 -0700)
commite0b98c79e605f64f263ede53344f283f5e0548be
treed6a266d1d3f97d0e996a402c58810680a584ac7a
parent02459eaab98a6a57717bc0cacede148fc76af881
parentfaa725332f39329288f52b7f872ffda866ba5b09
Merge head 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev