| commit | 5b1f6d81e4c63ae30d92678cc35081001add7674 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed Jul 18 06:22:45 2012 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed Jul 18 06:22:45 2012 -0700 |
| tree | 8980816357cfe8df56ca9735da73b75c1ed6d235 | |
| parent | 8397c76a2c209997c7119bede2f26e51d8c786bc [diff] | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c [diff] |
Merge 3.5-rc7 into char-misc-next. This lets us pick up the mei driver changes that we need in order to handle future merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>