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)
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev


Trivial merge