[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20091130135320.215722a2.sfr@canb.auug.org.au>
Date: Mon, 30 Nov 2009 13:53:20 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jiri Kosina <jkosina@...e.cz>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Ben Hutchings <bhutchings@...arflare.com>,
"David S. Miller" <davem@...emloft.net>,
"André Goddard Rosa" <andre.goddard@...il.com>
Subject: linux-next: manual merge of the trivial tree with the net tree
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/net/sfc/falcon.c between commit
127e6e10ad17585c48cba8e1dcf30d98b90ee583 ("sfc: Fix bugs in RX queue
flushing") from the net tree and commit
4e5cf22a6f45b6489f84de03d3a1dfa60cc4b4e4 ("tree-wide: fix assorted typos
all over the place") from the trivial tree.
The former removed the comment that the latter was fixing.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists