From: Lachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Date: Fri, 23 May 2008 03:48:37 +0000 (+1000)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
X-Git-Tag: v2.6.26-rc4~62^2~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1e554aeea12d2dab5183e011c27dee6142dc927;p=linux-2.6

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

c1e554aeea12d2dab5183e011c27dee6142dc927