Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 13 Oct 2005 02:07:38 +0000 (19:07 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 13 Oct 2005 02:07:38 +0000 (19:07 -0700)
commit1b66e9fe8523cc239b6bea8443a860f50aeb2a83
tree7d067a24df07dc1116c7c636dc41f77ab874f167
parent67d2b48e20bfc82f8fdb5410c28564b8b058fcab
parent9621904012de3c8d0d4e2904dcc7170b3012119e
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev