Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
Linus Torvalds [Mon, 9 Jan 2006 04:18:44 +0000 (20:18 -0800)]

Trivial merge