commit | 5bd2010fbe027b224db2e74a4fdfec9a7b7918d2 | [log] [tgz] |
---|---|---|
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Tue Dec 24 09:43:21 2013 -0800 |
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Tue Dec 24 09:43:21 2013 -0800 |
tree | 59106aae3930a3608409c101ec32d68742c8d168 | |
parent | 41f107266b19d100c1bcef9e1e1aef00692c1209 [diff] | |
parent | 413541dd66d51f791a0b169d9b9014e4f56be13c [diff] |
Merge 3.13-rc5 into staging-next We want these fixes here to handle some merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>