Subject: linux-next: manual merge of the trivial tree with the net tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 30 Nov 2009 13:53:20 +1100

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                    [email-masked]
http://www.canb.auug.org.au/~sfr/