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

From: Stephen Rothwell
Date: Fri Apr 08 2011 - 02:02:16 EST

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/gma500/psb_ttm_fence_user.h between commit 25985edcedea
("Fix common misspellings") from Linus' tree and commit aea74b656799
("staging: gma500: kill off TTM") from the staging tree.

The latter removed the file, so I did that.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature