Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Dec 2005 05:41:58 +0000 (21:41 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Dec 2005 05:41:58 +0000 (21:41 -0800)
commitb11d0e48aa41b644143ca526ef8d69212fdc1cdd
treebb55e976402bc87cc8a9f5372dc947500777216b
parent47807ce381acc34a7ffee2b42e35e96c0f322e52
parentdfa159886f38344ede31e3b13ec614e0bebc09c6
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev