| commit | 6a2a2cdd57d11ee3117539b846a45df6efbd35b1 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sun Sep 16 17:17:25 2012 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sun Sep 16 17:17:25 2012 -0700 |
| tree | b6ab218810666a75d6612bde4d4a224118c0834c | |
| parent | 8e360ec82322358056786e651322085af3ef6960 [diff] | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 [diff] |
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>