projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit7da59d2fe30d8169c7c9e7b488beb1b9af932608
tree02438ff9c258cf80d3a3955215fbcff7bd7e392etree | snapshot (tar.gz zip)
parentfea7a08acb13524b47711625eebea40a0ede69a0commit | diff
parent877cdf3949cc67d00677a1dfb913001f324ac40dcommit | diff
Merge v3.6-rc3 into 'char-misc-next'

This resolves a conflict in:
drivers/misc/mei/interrupt.c

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