kernel-fxtec-pro1x/net/ceph
David S. Miller fe6c791570 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
	net/llc/af_llc.c
2010-12-08 13:47:38 -08:00
..
crush ceph: factor out libceph from Ceph file system 2010-10-20 15:37:28 -07:00
armor.c ceph: factor out libceph from Ceph file system 2010-10-20 15:37:28 -07:00
auth.c ceph: factor out libceph from Ceph file system 2010-10-20 15:37:28 -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.c ceph: factor out libceph from Ceph file system 2010-10-20 15:37:28 -07:00
auth_x.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
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: factor out libceph from Ceph file system 2010-10-20 15:37:28 -07:00
ceph_hash.c ceph: factor out libceph from Ceph file system 2010-10-20 15:37:28 -07:00
ceph_strings.c ceph: factor out libceph from Ceph file system 2010-10-20 15:37:28 -07:00
crypto.c ceph: factor out libceph from Ceph file system 2010-10-20 15:37:28 -07:00
crypto.h ceph: factor out libceph from Ceph file system 2010-10-20 15:37:28 -07:00
debugfs.c rbd: introduce rados block device (rbd), based on libceph 2010-10-20 15:38:13 -07:00
Kconfig ceph: factor out libceph from Ceph file system 2010-10-20 15:37:28 -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 ceph: factor out libceph from Ceph file system 2010-10-20 15:37:28 -07:00
mon_client.c ceph: factor out libceph from Ceph file system 2010-10-20 15:37:28 -07:00
msgpool.c ceph: factor out libceph from Ceph file system 2010-10-20 15:37:28 -07:00
osd_client.c ceph: factor out libceph from Ceph file system 2010-10-20 15:37:28 -07:00
osdmap.c ceph: factor out libceph from Ceph file system 2010-10-20 15:37:28 -07:00
pagelist.c ceph: fix num_pages_free accounting in pagelist 2010-10-20 15:38:23 -07:00
pagevec.c ceph: factor out libceph from Ceph file system 2010-10-20 15:37:28 -07:00