David S. Miller 6a7ebdf2fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: net/bluetooth/l2cap_core.c		2011-07-14 07:56:40 -07:00
..
crush	…
Kconfig	libceph: Get secret from the kernel keys api when mounting with key=NAME.	2011-03-29 12:11:19 -07:00
Makefile	…
armor.c	…
auth.c	ceph: Move secret key parsing earlier.	2011-03-29 12:11:16 -07:00
auth_none.c	…
auth_none.h	…
auth_x.c	ceph: Move secret key parsing earlier.	2011-03-29 12:11:16 -07:00
auth_x.h	…
auth_x_protocol.h	…
buffer.c	…
ceph_common.c	libceph: Create a new key type "ceph".	2011-03-29 12:11:24 -07:00
ceph_fs.c	…
ceph_hash.c	…
ceph_strings.c	…
crypto.c	net: Remove casts of void *	2011-06-16 23:19:27 -04:00
crypto.h	libceph: Create a new key type "ceph".	2011-03-29 12:11:24 -07:00
debugfs.c	…
messenger.c	libceph: add missing breaks in addr_set_port	2011-05-19 11:25:05 -07:00
mon_client.c	ceph: Move secret key parsing earlier.	2011-03-29 12:11:16 -07:00
msgpool.c	…
osd_client.c	libceph: fix page calculation for non-page-aligned io	2011-06-13 16:26:17 -07:00
osdmap.c	libceph: handle new osdmap down/state change encoding	2011-05-24 11:52:09 -07:00
pagelist.c	…
pagevec.c	…