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

Conflicts:
	net/ipv4/fib_frontend.c

2010-12-26 22:37:05 -08:00

..

crush

…

armor.c

…

auth_none.c

…

auth_none.h

…

auth_x_protocol.h

…

auth_x.c

…

auth_x.h

…

auth.c

…

buffer.c

net: allow GFP_HIGHMEM in __vmalloc()

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

ceph_common.c

ceph: don't crash when passed bad mount options

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

ceph_fs.c

…

ceph_hash.c

…

ceph_strings.c

…

crypto.c

…

crypto.h

…

debugfs.c

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

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

Kconfig

…

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

ceph: fix msgr_init error path

2010-12-13 20:30:28 -08:00

mon_client.c

…

msgpool.c

…

osd_client.c

ceph: explicitly specify page alignment in network messages

2010-11-09 12:43:17 -08:00

osdmap.c

…

pagelist.c

ceph: fix num_pages_free accounting in pagelist

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

pagevec.c

ceph: handle partial result from get_user_pages

2010-12-17 09:55:59 -08:00