Staging: Merge Ben Collins solo6x10 tree with upstream

There were some duplicate changes that needed to be hand-merged due to
fixes needed to keep .37 building and working properly.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2010-11-09 16:12:37 -08:00
commit 050afc92ee
12 changed files with 565 additions and 206 deletions