From f55cf3c76a3b2e4bdcfea4f95c9d527663b41ece Mon Sep 17 00:00:00 2001
From: James Morris <jmorris@namei.org>
Date: Thu, 9 Jun 2011 10:24:49 +1000
Subject: [PATCH] Merge branch 'linus'; commit 'v3.0-rc2' into next