From: Wayne Scott Date: Mon, 20 Jun 2005 15:09:44 GMT Subject: How did this odd merge happen? Message-ID: <59a6e583050620080947aea144@mail.gmail.com> $ git-cat-file commit 13e652800d1644dfedcd0d59ac95ef0beb7f3165 tree 6cdd9771bd9a56de1b0246a330ccd916ecdb1d41 parent 4332bdd332a2dca93dc3b1d017b2dd27d5c8cef3 parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 author David Woodhouse 1115555034 +0100 committer David Woodhouse 1115555034 +0100 Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git -Wayne