[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20091109154305.49d3eb7c.sfr@canb.auug.org.au>
Date: Mon, 9 Nov 2009 15:43:05 +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,
Thadeu Lima de Souza Cascardo <cascardo@...oscopio.com>,
Bartlomiej Zolnierkiewicz <bzolnier@...il.com>,
"John W. Linville" <linville@...driver.com>
Subject: linux-next: manual merge of the trivial tree with the tree
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/net/wireless/rt2x00/rt2800usb.c between commit
fcf5154118849cca3cdf424e83f863225d8173e7 ("rt2800: add rt2800lib (part
three)") from the wireless tree and commit
305409a25f7df3c359ba67cbeb62763eeb7156e9 ("tree-wide: fix some typos and
punctuation in comments") from the trivial tree.
The misspelling is moved to a new file
(drivers/net/wireless/rt2x00/rt2800lib.c), but I didn't bother fixing it up.
--
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