Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 3 Oct 2006 15:53:46 +0000 (08:53 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 3 Oct 2006 15:53:46 +0000 (08:53 -0700)
commit1e9abb5b1dc90cfcf0e6f1e10f7aaf34d0f33b6b
treeeb98475ce831e8265c120b58be677010c423890f
parent65fc471343acbab05e2e24ad9688af43a37d6a1b
parent3998a7a9d37f72c6fffd58ff39fd17f7c11a00f3
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.
MAINTAINERS