From: Stephen Rothwell <sfr@canb•auug.org.au>
To: michal.simek@petalogix•com
Cc: linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: Tree for July 26
Date: Mon, 26 Jul 2010 19:19:02 +1000 [thread overview]
Message-ID: <20100726191902.5ebe1030.sfr@canb.auug.org.au> (raw)
In-Reply-To: <4C4D4D00.30304@petalogix.com>
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
Hi Michal,
On Mon, 26 Jul 2010 10:53:20 +0200 Michal Simek <michal.simek@petalogix•com> wrote:
>
> Merging microblaze/next
> CONFLICT (content): Merge conflict in arch/microblaze/mm/init.c
>
> Fixed.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2010-07-26 9:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-26 5:48 linux-next: Tree for July 26 Stephen Rothwell
2010-07-26 8:53 ` Michal Simek
2010-07-26 9:19 ` Stephen Rothwell [this message]
2010-07-26 16:16 ` linux-next: Tree for July 26 (xen) Randy Dunlap
2010-07-27 0:38 ` Jeremy Fitzhardinge
-- strict thread matches above, loose matches on Subject: below --
2011-07-26 5:57 linux-next: Tree for July 26 Stephen Rothwell
2011-07-26 9:34 ` Michal Simek
2012-07-26 5:04 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=20100726191902.5ebe1030.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=michal.simek@petalogix$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox