From: Sage Weil <sage@inktank.com>
Date: Fri, 15 Jun 2012 19:32:04 +0000 (-0700)
Subject: Merge tag 'v3.5-rc1'
X-Git-Tag: v3.6-rc1~36^2~103
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a64e8e0ace51b309fdcff4b4754b3649250382a;p=pandora-kernel.git

Merge tag 'v3.5-rc1'

Linux 3.5-rc1

Conflicts:
	net/ceph/messenger.c
---

9a64e8e0ace51b309fdcff4b4754b3649250382a
Reading git-diff-tree failed