From: Michal Simek <monstr@monstr.eu>
Date: Fri, 30 Mar 2012 10:10:03 +0000 (+0200)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
X-Git-Tag: v3.4-rc2~34^2~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=6a4770e335bd4df0a4577146f76e116ab6e23f40;p=linux.git

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

6a4770e335bd4df0a4577146f76e116ab6e23f40