]> git.baikalelectronics.ru Git - kernel.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)
commitf7abf7f04064b849d079b726339e09607ae0a114
tree1f0d75c196c5ab0408c55ed6cf3a152f1f921e15
parentb8a5d18be65671fd01293d5e600a1299a7198f03
parenta37c45859bb7a3b7a6d3c2dc0a4466159cbaa6fe
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