Merge of 'new-ids' branch from
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 26 May 2005 00:56:57 +0000 (17:56 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 26 May 2005 00:56:57 +0000 (17:56 -0700)
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev


Trivial merge