]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge 3.10-rc6 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Jun 2013 18:54:25 +0000 (11:54 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Jun 2013 18:54:25 +0000 (11:54 -0700)
We want the fixes in here.

1  2 
drivers/misc/mei/pci-me.c

Simple merge