Greg Kroah-Hartman f341dddf1d Staging: merge staging patches into Linus's main branch ...

There were a number of patches that went into Linus's
tree already that conflicted with other changes in the
staging branch.  This merge resolves those merge conflicts.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2010-03-04 08:39:02 -08:00

..

Kconfig

staging: sm7xx: remove the buggy 2D acceleration support

2010-03-03 16:42:44 -08:00

Makefile

…

smtcfb.c

Staging: merge staging patches into Linus's main branch

2010-03-04 08:39:02 -08:00

smtcfb.h

MIPS: Loongson: Change the Email address of Wu Zhangjin

2010-02-27 12:53:12 +01:00

TODO

staging: sm7xx: remove the buggy 2D acceleration support

2010-03-03 16:42:44 -08:00