Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
Linus Torvalds [Thu, 18 Aug 2005 22:16:12 +0000 (15:16 -0700)]

Trivial merge