Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux...
Linus Torvalds [Thu, 8 Sep 2005 14:21:59 +0000 (07:21 -0700)]

Trivial merge