commit | d7173493683853047d6efc8d4454c70469a7b033 | [log] [tgz] |
---|---|---|
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sun Sep 29 18:27:03 2013 -0700 |
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sun Sep 29 18:27:03 2013 -0700 |
tree | 8e6dac16d3104494b5cc2f33756c582ecdc3b753 | |
parent | 80d26236c7c583ea2f43b68008ab7e067102c62c [diff] | |
parent | 15c03dd4859ab16f9212238f29dd315654aa94f6 [diff] |
Merge 3.12-rc3 into char-misc-next We need/want the mei fixes in here so we can apply other updates that are depending on them. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>