git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8397c76 84a1caf)
Merge 3.5-rc7 into char-misc-next.
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Jul 2012 13:22:45 +0000 (06:22 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Jul 2012 13:22:45 +0000 (06:22 -0700)
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>

Trivial merge
Pandora Kernel Repository