Subject: linux-next: manual merge of the bjdooks-i2c tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 8 Apr 2011 13:20:15 +1000

Hi Ben,

Today's linux-next merge of the bjdooks-i2c tree got a conflict in
drivers/i2c/busses/i2c-intel-mid.c between commit 25985edcedea ("Fix
common misspellings") from Linus' tree and commit 5c7d3e377ddd
("i2c-intel-mid.c: Remove i2c-intel-mid.c") from the bjdooks-i2c tree.

The latter removes the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/