Merge branch 'merge' into next

Merge my own merge branch to get various fixes from there
and upstream, especially the hvc console tty refcouting fixes
which which testing is quite a bit harder...

1 files changed, 0 insertions, 8 deletions

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 52190a938b4a..4e8ba39eaf0f 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -358,14 +358,6 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "VGN-Z540N"),
                 },
         },
-        {       /* Handle problems with rebooting on CompuLab SBC-FITPC2 */
-                .callback = set_bios_reboot,
-                .ident = "CompuLab SBC-FITPC2",
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "CompuLab"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "SBC-FITPC2"),
-                },
-        },
         {       /* Handle problems with rebooting on ASUS P4S800 */
                 .callback = set_bios_reboot,
                 .ident = "ASUS P4S800",