From: Linus Torvalds Date: Tue, 3 Oct 2006 15:53:46 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6 X-Git-Tag: v2.6.19-rc1~217 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=1e9abb5b1dc90cfcf0e6f1e10f7aaf34d0f33b6b;hp=-c Merge /pub/scm/linux/kernel/git/lethal/sh64-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6: sh64: Remove me from sh64 maintainers. sh64: Update cayman defconfig. --- 1e9abb5b1dc90cfcf0e6f1e10f7aaf34d0f33b6b diff --combined MAINTAINERS index b62ab43c6094,081833d72415..28cd70cf3e99 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -2711,6 -2711,14 +2711,6 @@@ M: chrisw@sous-sol.or L: stable@kernel.org S: Maintained -STABLE BRANCH: -P: Greg Kroah-Hartman -M: greg@kroah.com -P: Chris Wright -M: chrisw@sous-sol.org -L: stable@kernel.org -S: Maintained - TPM DEVICE DRIVER P: Kylene Hall M: kjhall@us.ibm.com @@@ -2817,17 -2825,13 +2817,13 @@@ P: Paul Mund M: lethal@linux-sh.org L: linuxsh-dev@lists.sourceforge.net (subscribers-only) W: http://www.linux-sh.org - W: http://www.m17n.org/linux-sh/ S: Maintained SUPERH64 (sh64) P: Paul Mundt M: lethal@linux-sh.org - P: Richard Curnow - M: rc@rc0.org.uk L: linuxsh-shmedia-dev@lists.sourceforge.net W: http://www.linux-sh.org - W: http://www.rc0.org.uk/sh64 S: Maintained SUN3/3X