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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 7 May 2010 15:21:08 +1000

Hi Greg,

Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/hv/hv.c between commit
fa8ad0257ea256381126ecf447694622216c600f ("Staging: hv: Fix up memory
leak on HvCleanup") from Linus' tree and commit
eda95eef15e86e100aaeeec4e8ed3eb1eced2967 ("Staging: hv: rename Hv.c to
hv.c") from the staging-next tree.

I used the staging-next version.
-- 
Cheers,
Stephen Rothwell                    [email-masked]