]> git.karo-electronics.de Git - linux-beck.git/commitdiff
projects / linux-beck.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c765a6d accb884)
Merge branch 'char-misc-linus' into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Feb 2014 14:36:08 +0000 (06:36 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Feb 2014 14:36:08 +0000 (06:36 -0800)
We want the mei change here to allow future mei patches to apply
properly.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/misc/mei/client.c patch | diff1 | diff2 | blob | history

diff --cc drivers/misc/mei/client.c
Simple merge
Beck SC1x5 Kernel