summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-26 11:36:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-26 11:36:51 -0700
commitf19e6c69390251efa549ff07c863e09b94b81537 (patch)
tree3aebd43b979f9ae4ee7bea2856c6a5876173475e /MAINTAINERS
parent05e4cb7c25c1ac35a6a61c79ad40cf69dd3538bf (diff)
parent81b884c9dfe6753a78df0cbf4e96f095d718bd95 (diff)
downloadlinux-f19e6c69390251efa549ff07c863e09b94b81537.tar.bz2
Merge tag 'staging-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging fixes from Greg KH: "Here are some tiny drivers/staging/ fixes for 3.11-rc3 A number of bugfixes, all pretty tiny, but resolve issues that have been reported (the kstrtos32 change fixes a data corruption problem that Dan found). And a MAINTAINERS file update for the comedi drivers" * tag 'staging-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: MAINTAINERS: Update the list of maintainers for staging/comedi driver. staging: tidspbridge: replace strict_strtol() with kstrtos32() staging: android: logger: Correct write offset reset on error staging: zram: protect zram_reset_device() call staging: gdm72xx: potential use after free in send_qos_list() staging: drm/imx: drop "select OF_VIDEOMODE" staging: frontier: use after free in disconnect() staging: comedi: fix a race between do_cmd_ioctl() and read/write staging: comedi: COMEDI_CANCEL ioctl should wake up read/write
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index f817ae196a8e..a26b10e52aea 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7818,7 +7818,7 @@ F: drivers/staging/asus_oled/
STAGING - COMEDI
M: Ian Abbott <abbotti@mev.co.uk>
-M: Mori Hess <fmhess@users.sourceforge.net>
+M: H Hartley Sweeten <hsweeten@visionengravers.com>
S: Odd Fixes
F: drivers/staging/comedi/