Merge tag 'v3.5-rc1'
authorSage Weil <sage@inktank.com>
Fri, 15 Jun 2012 19:32:04 +0000 (12:32 -0700)
committerSage Weil <sage@inktank.com>
Fri, 15 Jun 2012 19:32:04 +0000 (12:32 -0700)
Linux 3.5-rc1

Conflicts:
net/ceph/messenger.c


Trivial merge