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

[Stephen Rothwell]

Hi Greg,

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

The latter removes the line that the former fixed, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature