diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-17 11:19:21 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-17 11:19:21 +1000 |
| commit | b6fa2aff9c18f7c6b760a3039ead8cbfbee85107 (patch) | |
| tree | 4592e577629a17dd8068508f16060f0dcc770902 /MAINTAINERS | |
| parent | 464abe705cfaa955e3210c27533d740758ac4ac7 (diff) | |
| parent | 63dc24ad6be731d977e090c67f03860e3f05230b (diff) | |
Merge remote branch 'ceph/for-next'
Conflicts:
net/Makefile
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b3f194ceaeef..22e4eccb9937 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1500,6 +1500,8 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git S: Supported F: Documentation/filesystems/ceph.txt F: fs/ceph +F: net/ceph +F: include/linux/ceph CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM: M: David Vrabel <david.vrabel@csr.com> @@ -4751,6 +4753,15 @@ F: fs/qnx4/ F: include/linux/qnx4_fs.h F: include/linux/qnxtypes.h +RADOS BLOCK DEVICE (RBD) +F: include/linux/qnxtypes.h +M: Yehuda Sadeh <yehuda@hq.newdream.net> +M: Sage Weil <sage@newdream.net> +M: ceph-devel@vger.kernel.org +S: Supported +F: drivers/block/rbd.c +F: drivers/block/rbd_types.h + RADEON FRAMEBUFFER DISPLAY DRIVER M: Benjamin Herrenschmidt <benh@kernel.crashing.org> L: linux-fbdev@vger.kernel.org |