From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 1 Apr 2008 04:22:26 +0000 (-0400)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
X-Git-Tag: v2.6.25-rc8~9^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=399f486286f44d55c4fff0e9cc5d712f2b443489;p=linux-2.6

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

399f486286f44d55c4fff0e9cc5d712f2b443489