Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 24 Dec 2005 20:40:43 +0000 (12:40 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 24 Dec 2005 20:40:43 +0000 (12:40 -0800)
commitcdcdb28623fb74d9564b102cd1cbe3854071e855
treedf9ce9bd9641236dd7a1ebf4c87854ccb62b7907
parent10bb10dcb685cbe078e611f2dca3bd3e42fba0a8
parentfd71da468dd8897fe3f565dfd3743a87d8678e3a
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev