Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 18 Nov 2005 20:19:12 +0000 (12:19 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 18 Nov 2005 20:19:12 +0000 (12:19 -0800)
commitd4bf205305a9188894ac4e2e9875e42f9f8eabfd
tree201bf41c29037721e5ca2c027d76679eae3f3606
parent8907e94be2661be940c622232d6ce5ae938f10c3
parente2b1be56c5656902744c2b52e8304126a40bb609
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev