Subject: linux-next: manual merge of the staging tree with the tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 10 Nov 2010 13:24:08 +1100

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/intel_sst/intel_sst_app_interface.c between commits from
the staging.current tree and commit
d0f40c5041f9c48afbd8f7fbf8a5faa9e5dbd39a ("Staging: intel_sst: Use
pr_fmt, fix misspellings") from the staging tree.

I have just ignored the changes from the staging tree for today.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/