From: Lachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Date: Mon, 18 Feb 2008 02:51:42 +0000 (+1100)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
X-Git-Tag: v2.6.25-rc3~133^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c58310bf4933986513020fa90b4190c7492995ae;p=linux-2.6

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

c58310bf4933986513020fa90b4190c7492995ae