projects / platform / kernel / linux-3.10.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02dbd0f 347e089)
Merge branch 'char-misc-linus' into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Mar 2013 23:09:30 +0000 (16:09 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Mar 2013 23:09:30 +0000 (16:09 -0700)
This picks up the MEI fixes that we need in this branch now.

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

diff --cc drivers/misc/mei/hw-me.c
Simple merge
diff --cc drivers/misc/mei/init.c
Simple merge
diff --cc drivers/misc/mei/mei_dev.h
Simple merge
Domain: System / Kernel;