linux-next: manual merge of the staging tree with the staging.current tree
Re: linux-next: manual merge of the staging tree with the staging.current tree