]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit088896b10aa4c89cc45bf7fcb0c1e3543fff2308
tree60426265759ab14b00c94a791520f140062bb57c
parent57b750fb3386a088c189756361e0cb9708194d1c
parent4ee3c5bc2be50dd6aef8d8d4299da43a1c62104b
Merge branch 'char-misc-linus' into char-misc-next

This picks up the MEI fixes that we need in this branch now.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/mei/hw-me.c
drivers/misc/mei/init.c
drivers/misc/mei/mei_dev.h