From: Lachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Date: Thu, 8 Jan 2009 02:22:55 +0000 (+1100)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.30-rc1~232^2~40
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6206aa8b2b9a45b4cf3ee31b7209b014be349fd9;p=users%2Fdwmw2%2Flinux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
---

6206aa8b2b9a45b4cf3ee31b7209b014be349fd9