tree b6ab218810666a75d6612bde4d4a224118c0834c
parent 8e360ec82322358056786e651322085af3ef6960
parent 5698bd757d55b1bb87edd1a9744ab09c142abfc2
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1347841045 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1347841045 -0700

Merge 3.6-rc6 into staging-next

This pulls in the staging tree fixes in 3.6-rc6 into our branch to resolve the
merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>