Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 17 Nov 2005 16:43:38 +0000 (08:43 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 17 Nov 2005 16:43:38 +0000 (08:43 -0800)
commitfbf0e1348ec4023675123d432ce1fdfa1eef8e54
tree06dff2cb05cd8f2d610aff11b1c7905153391a65
parentb7fd1edd2c0c225afa96af92d4adecb91e7d439d
parenta2c91a8819e315e9fd1aef3ff57badb6c1be3f80
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev