tree ea51b391f7d74ca695dcb9f5e46eb02688a92ed9
parent 81280572ca6f54009edfa4deee563e8678784218
parent a4ac0d847af9dd34d5953a5e264400326144b6b2
author Greg Kroah-Hartman <gregkh@suse.de> 1288284296 -0700
committer Greg Kroah-Hartman <gregkh@suse.de> 1288284296 -0700

Merge 'staging-next' to Linus's tree

This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.

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