From: Jens Axboe Date: Tue, 1 May 2012 12:29:55 +0000 (+0200) Subject: Merge tag 'v3.4-rc5' into for-3.5/core X-Git-Tag: v3.5-rc1~42^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b7877d4eea3f93e3dd941999522bbd8c538cb53;p=pandora-kernel.git Merge tag 'v3.4-rc5' into for-3.5/core The core branch is behind driver commits that we want to build on for 3.5, hence I'm pulling in a later -rc. Linux 3.4-rc5 Conflicts: Documentation/feature-removal-schedule.txt Signed-off-by: Jens Axboe --- 0b7877d4eea3f93e3dd941999522bbd8c538cb53 Reading git-diff-tree failed