aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-02-09 16:52:18 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-02-09 16:52:18 -0500
commitb05ee6bf9e6c7acc38dca1466b63bb24ae5df6f3 (patch)
tree434afa78fbfa784591d45a9befbaed247b26ae89 /MAINTAINERS
parentb0286db49a182187d39b512ee3748ae2b4dc3b17 (diff)
parent67435319866f89b55721fc88ca0dbda51629e3d6 (diff)
Merge tag 'staging-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Staging tree patches for 3.3-rc3 Big things here is the deletion of the Android pmem driver, as it's obsolete and no one uses it, the gma500 driver as it's already in the drm portion of the kernel tree, and the pohmelfs filesystem as it's obsolete and a rewritten version is being proposed for the fs/ section of the kernel. Other than that, a smattering of different bugfixes and regressions, and some omap drm api merge fixups that were needed due to api changes in the main portion of the drm tree, allowing this code to build properly again. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> * tag 'staging-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (28 commits) staging: pohmelfs: remove drivers/staging/pohmelfs staging: android/ram_console: Don't build on arches w/o ioremap staging: r8712u: Use asynchronous firmware loading staging: usbip: fix to prevent potentially using uninitialized spinlock staging: r8712u: Fix problem when CONFIG_R8712_AP is set staging: tidspbridge: fix incorrect free to drv_datap staging: tidspbridge: fix bridge_open memory leaks staging: android: lowmemorykiller: Don't wait more than one second for a process to die MAINTAINERS: staging: iio: add iio information staging: zcache: fix serialization bug in zv stats staging: fix go7007-usb license Staging: android: binder: Fix crashes when sharing a binder file between processes Staging: android: Remove pmem driver Staging: asus_oled: fix NULL-ptr crash on unloading Staging: asus_oled: fix image processing Staging: android: binder: Don't call dump_stack in binder_vma_open staging: r8712u: Add new Sitecom UsB ID zcache: Set SWIZ_BITS to 8 to reduce tmem bucket lock contention. zcache: fix deadlock condition staging: drm/omap: fix locking issue ...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 55ca0bea142..9a648eb8e21 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3318,6 +3318,12 @@ S: Maintained
3318F: net/ieee802154/ 3318F: net/ieee802154/
3319F: drivers/ieee802154/ 3319F: drivers/ieee802154/
3320 3320
3321IIO SUBSYSTEM AND DRIVERS
3322M: Jonathan Cameron <jic23@cam.ac.uk>
3323L: linux-iio@vger.kernel.org
3324S: Maintained
3325F: drivers/staging/iio/
3326
3321IKANOS/ADI EAGLE ADSL USB DRIVER 3327IKANOS/ADI EAGLE ADSL USB DRIVER
3322M: Matthieu Castet <castet.matthieu@free.fr> 3328M: Matthieu Castet <castet.matthieu@free.fr>
3323M: Stanislaw Gruszka <stf_xl@wp.pl> 3329M: Stanislaw Gruszka <stf_xl@wp.pl>