| commit | 9c5891bd4342349a200676d33f742dd1b864822c | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Jul 29 11:50:17 2013 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Jul 29 11:50:17 2013 -0700 |
| tree | b14c1698f2d8ce5276e1befd562f6398a46b48b9 | |
| parent | ecda040ff3724f021a96491ecee88d48e968c153 [diff] | |
| parent | 5ae90d8e467e625e447000cb4335c4db973b1095 [diff] |
Merge 3.11-rc3 into char-misc-next. This resolves a merge issue with: drivers/misc/mei/init.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>