summaryrefslogtreecommitdiff
path: root/drivers/staging/lustre/TODO
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-18 21:27:12 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-18 21:27:12 +0400
commit9d265649a86c6c0e4bae164a4c5ce806f0f12fc8 (patch)
treea782d3ffe0a171e540fdda19764ab81e11cb1a4c /drivers/staging/lustre/TODO
parent6d36b6f313738e99fc8b903697f8ecf06add29aa (diff)
parent6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 (diff)
downloadlinux-9d265649a86c6c0e4bae164a4c5ce806f0f12fc8.tar.xz
Merge 3.14-rc3 into usb-next
We want the fixes in this branch as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/TODO')
-rw-r--r--drivers/staging/lustre/TODO5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/lustre/TODO b/drivers/staging/lustre/TODO
index 22742d6d62a8..0a2b6cb3775e 100644
--- a/drivers/staging/lustre/TODO
+++ b/drivers/staging/lustre/TODO
@@ -9,5 +9,6 @@
* Other minor misc cleanups...
Please send any patches to Greg Kroah-Hartman <greg@kroah.com>, Andreas Dilger
-<andreas.dilger@intel.com> and Peng Tao <tao.peng@emc.com>. CCing
-hpdd-discuss <hpdd-discuss@lists.01.org> would be great too.
+<andreas.dilger@intel.com>, Oleg Drokin <oleg.drokin@intel.com> and
+Peng Tao <tao.peng@emc.com>. CCing hpdd-discuss <hpdd-discuss@lists.01.org>
+would be great too.