projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8397c76 84a1caf)
Merge 3.5-rc7 into char-misc-next.
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Jul 2012 13:22:45 +0000 (06:22 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Jul 2012 13:22:45 +0000 (06:22 -0700)
commit5b1f6d81e4c63ae30d92678cc35081001add7674
tree8980816357cfe8df56ca9735da73b75c1ed6d235tree | snapshot
parent8397c76a2c209997c7119bede2f26e51d8c786bccommit | diff
parent84a1caf1453c3d44050bd22db958af4a7f99315ccommit | diff
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>
drivers/misc/mei/interrupt.c diff1 | diff2 | blob | history
drivers/misc/mei/main.c diff1 | diff2 | blob | history
drivers/misc/mei/wd.c diff1 | diff2 | blob | history
Linux Kernel tree with some unpolished code for Colibri/Apalis modules