| commit | 912cbd495204ee6fcb67b8704ffbda10615d1f2f | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Tue Dec 24 10:06:37 2013 -0800 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Tue Dec 24 10:06:37 2013 -0800 |
| tree | 1053bc0bf681a7a4448b5344dddb5f425e0b7920 | |
| parent | 1785faacf3ac245f5e8d920197cd09a65a68f17f [diff] | |
| parent | 413541dd66d51f791a0b169d9b9014e4f56be13c [diff] |
Merge 3.13-rc5 into staging-next This resolves a merge issue with drivers/staging/imx-drm/imx-drm-core.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>