David S. Miller 9f6ec8d697 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
	drivers/net/wireless/rtlwifi/pci.c
	net/netfilter/ipvs/ip_vs_core.c

2011-06-20 22:29:08 -07:00

..

crush

ceph: factor out libceph from Ceph file system

2010-10-20 15:37:28 -07:00

armor.c

libceph: Fix base64-decoding when input ends in newline.

2011-03-15 09:14:02 -07:00

auth_none.c

ceph: factor out libceph from Ceph file system

2010-10-20 15:37:28 -07:00

auth_none.h

ceph: factor out libceph from Ceph file system

2010-10-20 15:37:28 -07:00

auth_x_protocol.h

ceph: factor out libceph from Ceph file system

2010-10-20 15:37:28 -07:00

auth_x.c

ceph: Move secret key parsing earlier.

2011-03-29 12:11:16 -07:00

auth_x.h

ceph: factor out libceph from Ceph file system

2010-10-20 15:37:28 -07:00

auth.c

ceph: Move secret key parsing earlier.

2011-03-29 12:11:16 -07:00

buffer.c

net: allow GFP_HIGHMEM in __vmalloc()

2010-11-21 10:04:04 -08:00

ceph_common.c

libceph: Create a new key type "ceph".

2011-03-29 12:11:24 -07:00

ceph_fs.c

ceph: factor out libceph from Ceph file system

2010-10-20 15:37:28 -07:00

ceph_hash.c

ceph: add dir_layout to inode

2011-01-12 15:15:12 -08:00

ceph_strings.c

ceph: factor out libceph from Ceph file system

2010-10-20 15:37:28 -07:00

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

rbd: introduce rados block device (rbd), based on libceph

2010-10-20 15:38:13 -07:00

Kconfig

libceph: Get secret from the kernel keys api when mounting with key=NAME.

2011-03-29 12:11:19 -07:00

Makefile

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-12-08 13:47:38 -08:00

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

ceph: factor out libceph from Ceph file system

2010-10-20 15:37:28 -07:00

osd_client.c

ceph: fix sync vs canceled write

2011-06-07 21:34:13 -07:00

osdmap.c

libceph: handle new osdmap down/state change encoding

2011-05-24 11:52:09 -07:00

pagelist.c

ceph: fix num_pages_free accounting in pagelist

2010-10-20 15:38:23 -07:00

pagevec.c

libceph: fix handling of short returns from get_user_pages

2011-03-03 13:47:39 -08:00