From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 15 Dec 2009 16:49:32 +0000 (-0800)
Subject: Merge commit 'linus' into next
X-Git-Tag: v2.6.33-rc1~61^2~5
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=7547a3e8a43d31aaf91c2daf5f597e43212ccddf;p=net-next-2.6.git

Merge commit 'linus' into next
---

7547a3e8a43d31aaf91c2daf5f597e43212ccddf