Automatic merge of 'misc-fixes' branch from
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 30 May 2005 02:30:03 +0000 (19:30 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 30 May 2005 02:30:03 +0000 (19:30 -0700)
commit79158229b09873ca296ac53de5c952488f944646
tree5ebf559f71fd4f4e4cbf12f5cd97242da53d9af7
parent7ce54e3f428b33af714271140601c87b8bf2c544
parent7238cfb3342078ad6d1dd06c7b567da428672476
Automatic merge of 'misc-fixes' branch from

rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev