]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
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)
commit9a64e8e0ace51b309fdcff4b4754b3649250382a
tree1f0d75c196c5ab0408c55ed6cf3a152f1f921e15
parentf3dea7edd3d449fe7a6d402c1ce56a294b985261
parentf8f5701bdaf9134b1f90e5044a82c66324d2073f
Merge tag 'v3.5-rc1'

Linux 3.5-rc1

Conflicts:
net/ceph/messenger.c
include/linux/ceph/libceph.h
net/ceph/ceph_common.c
net/ceph/messenger.c
net/ceph/mon_client.c
net/ceph/osd_client.c
net/ceph/osdmap.c