From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 16 Jan 2006 00:43:29 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
X-Git-Tag: v2.6.16-rc1~97
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f02d072d46bb409e8ca3cf16c0511f5c21adaf6;p=linux-2.6

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
---

3f02d072d46bb409e8ca3cf16c0511f5c21adaf6