From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 5 Jan 2006 00:34:57 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
X-Git-Tag: v2.6.16-rc1~474^2~22^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52347f4e810ba323d02cd2c26b5d738f4a2c3d5e;p=thirdparty%2Flinux.git

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

52347f4e810ba323d02cd2c26b5d738f4a2c3d5e