Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
commit4ba529a8a39e15688b6a3d31b11930d1f8a1edad
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 13 Nov 2005 21:45:00 +0000 (13 13:45 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 13 Nov 2005 21:45:00 +0000 (13 13:45 -0800)
tree4a57f09fd8b96f1eb5f87f52fd0862db49f29e31
parent41866a56cc4e676240b94ed8eaeca375aaef7496
parentdcc2d1e7f0acf7d3f7ae632a73cd5f828ef9de20
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev