linux-next: manual merge of the staging tree with the mips tree
From: Stephen Rothwell
Date: Mon Jan 18 2010 - 02:54:15 EST
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/sm7xx/smtc2d.c drivers/staging/sm7xx/smtc2d.h between
commit 8cdfa0e5f204ee97d27f742ebd207f4de8ca2984 ("Loongson: Change the
Email address of Wu Zhangjin") from the mips tree and commit
1467bbc532da8c044e57706db232efe616ae5b00 ("staging: sm7xx: remove the
buggy 2D acceleration support") from the staging tree.
I just removed the 2 files (as was done in the staging tree).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature