From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 18 Jul 2012 13:22:45 +0000 (-0700)
Subject: Merge 3.5-rc7 into char-misc-next.
X-Git-Tag: next-20120724~20^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5b1f6d81e4c63ae30d92678cc35081001add7674;p=karo-tx-linux.git

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>
---

5b1f6d81e4c63ae30d92678cc35081001add7674