3.0-stable review patch. If anyone has any objections, please let me know.
------------------ There was a mismerge of 7b175c46720f8e6b92801bb634c93d1016f80c62 for the 3.0 kernel, so this fixes it up. Also mark the stable stuff "Supported", as it is. Reported-by: Ben Hutchings <b...@decadent.org.uk> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5725,7 +5725,6 @@ P: Vincent Sanders <vi...@simtec.co.uk> M: Simtec Linux Team <li...@simtec.co.uk> W: http://www.simtec.co.uk/products/EB110ATX/ S: Supported -F: Documentation/stable_kernel_rules.txt SIMTEC EB2410ITX (BAST) P: Ben Dooks @@ -6041,7 +6040,8 @@ F: arch/alpha/kernel/srm_env.c STABLE BRANCH M: Greg Kroah-Hartman <g...@kroah.com> L: sta...@vger.kernel.org -S: Maintained +S: Supported +F: Documentation/stable_kernel_rules.txt STAGING SUBSYSTEM M: Greg Kroah-Hartman <gre...@suse.de> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
