From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 1 Dec 2009 07:16:22 +0000 (+0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.33-rc1~365^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=838632438145ac6863377eb12d8b8eef9c55d288;p=thirdparty%2Flinux.git

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

838632438145ac6863377eb12d8b8eef9c55d288