From 45b0f25105e7cd32388dafe1f49b94f4eef16632 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 21 Sep 2009 17:04:21 -0700
Subject: [PATCH] --- yaml --- r: 164515 b: refs/heads/master c:
 42498316132e89ca2835b977a7cfb32a83e97b35 h: refs/heads/master i:   164513:
 123c59d25427aa8af250972d5f01468a0c62ef68   164511:
 b321f4b5433dcefcfdd8e759b25e88e7c989124d v: v3

---
 [refs]                          | 2 +-
 trunk/scripts/get_maintainer.pl | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 74d765a0c4c2..d029cd4cec23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8cbb3a77e1a91073fb279a495a11d5093461dfe5
+refs/heads/master: 42498316132e89ca2835b977a7cfb32a83e97b35
diff --git a/trunk/scripts/get_maintainer.pl b/trunk/scripts/get_maintainer.pl
index 8b80b5abb860..446803efe620 100755
--- a/trunk/scripts/get_maintainer.pl
+++ b/trunk/scripts/get_maintainer.pl
@@ -105,6 +105,10 @@
     die "$P: argument missing: patchfile or -f file please\n";
 }
 
+if ($output_separator ne ", ") {
+    $output_multiline = 0;
+}
+
 my $selections = $email + $scm + $status + $subsystem + $web;
 if ($selections == 0) {
     usage();
@@ -376,6 +380,7 @@ sub usage {
 
 Output type options:
   --separator [, ] => separator for multiple entries on 1 line
+    using --separator also sets --nomultiline if --separator is not [, ]
   --multiline => print 1 entry per line
 
 Other options: