git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fea7a08 877cdf3)
Merge v3.6-rc3 into 'char-misc-next'
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Aug 2012 16:09:07 +0000 (09:09 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Aug 2012 16:09:07 +0000 (09:09 -0700)
This resolves a conflict in:
drivers/misc/mei/interrupt.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.