From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Fri, 25 Apr 2008 03:37:52 +0000 (-0400)
Subject: Merge branch 'master' into for-linus
X-Git-Tag: v2.6.26-rc1~1062^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=308f0a5898033691d050374a949bbfe173987a16;p=linux-2.6

Merge branch 'master' into for-linus
---

308f0a5898033691d050374a949bbfe173987a16