Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Dec 2005 16:53:56 +0000 (08:53 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Dec 2005 16:53:56 +0000 (08:53 -0800)
commit90ac8f7741be4ff66de1f52904f4f67f272f74ce
treed20316f5eb9fe399edd81c14d801602aac64a752
parent98684a9d91bceff829b6dc7adf0f662d59cfa6e3
parent50630195bbdfe1ca775d94cd68a5f18bc1b717e4
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev