Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 10 Feb 2006 00:18:19 +0000 (16:18 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 10 Feb 2006 00:18:19 +0000 (16:18 -0800)
commitb481b4ecf5205f8e73e8f618085dbe3e070e9e31
tree08b008dca74ff9cd2a3eaa0d777c2249565f6365
parent9ac95f2f90e022c16d293d7978faddf7e779a1a9
parent9caafa6c8686e319cf4d5f3757b3972c6c522b7c
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev