LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Haavard Skinnemoen <hskinnemoen@atmel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Matthew Wilcox <matthew@wil.cx>,
	linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
	Greg KH <greg@kroah.com>, Mark Fasheh <mark.fasheh@oracle.com>
Subject: Re: linux-next: semaphore update merge conflicts
Date: Fri, 29 Feb 2008 11:17:31 +0100	[thread overview]
Message-ID: <20080229111731.13840877@hskinnemoen.norway.atmel.com> (raw)
In-Reply-To: <20080229153958.fc34e281.sfr@canb.auug.org.au>

On Fri, 29 Feb 2008 15:39:58 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> 	arch/avr32/kernel/semaphore.c
> 		the avr32 tree appeared to just change spaces to tabs
> 		in this file so I removed it (as your changes did).

I yanked that change out of my tree. No point cleaning up that file if
it's going away.

Haavard

  reply	other threads:[~2008-02-29 10:18 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-29  4:39 Stephen Rothwell
2008-02-29 10:17 ` Haavard Skinnemoen [this message]
2008-02-29 12:17   ` Stephen Rothwell
2008-02-29 12:25     ` Haavard Skinnemoen
2008-02-29 12:30       ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080229111731.13840877@hskinnemoen.norway.atmel.com \
    --to=hskinnemoen@atmel.com \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mark.fasheh@oracle.com \
    --cc=matthew@wil.cx \
    --cc=sfr@canb.auug.org.au \
    --subject='Re: linux-next: semaphore update merge conflicts' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).