Staging: Merge Ben Collins solo6x10 tree with upstream
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 10 Nov 2010 00:12:37 +0000 (16:12 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 10 Nov 2010 00:12:37 +0000 (16:12 -0800)
commit050afc92ee394ccdd953f91dcbbf9af863af8efc
tree2a602d5aea28a85279c091388bd801823b660766
parent391a169e99c789d59ef2a6b0cb80d1c6f63238dd
parent5bf68592e72eb0ded154efaaf43b39aab6964fc3
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>