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)
commit0e496b8e84410c96d1ffc86f0b37b0328a4234da
treed8a2aeeaee03eb4f305ba4dc5ab9395c4ee31321
parent214da6728acac285cac0e8e9b6c4c13838b8e1b0
parent7d132055814ef17a6c7b69f342244c410a5e000f
Merge 3.10-rc6 into char-misc-next

We want the fixes in here.
drivers/misc/mei/pci-me.c