Merge branch 'master' into upstream

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-egalax.c
index bbab6cf,5a1b52e..72b1dd8
--- 1/drivers/hid/hid-egalax.c
--- 2/drivers/hid/hid-egalax.c
+++ b/drivers/hid/hid-egalax.c
@@@ -221,9 -221,9 +221,9 @@@ static int egalax_probe(struct hid_devi
        struct egalax_data *td;
        struct hid_report *report;
  
-       td = kmalloc(sizeof(struct egalax_data), GFP_KERNEL);
+       td = kzalloc(sizeof(struct egalax_data), GFP_KERNEL);
        if (!td) {
 -              dev_err(&hdev->dev, "cannot allocate eGalax data\n");
 +              hid_err(hdev, "cannot allocate eGalax data\n");
                return -ENOMEM;
        }
        hid_set_drvdata(hdev, td);

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/hid/hid-input.c
Simple merge

diff --cc drivers/hid/hid-tmff.c
Simple merge

diff --cc drivers/hid/hidraw.c
Simple merge

diff --cc drivers/hid/usbhid/hiddev.c
Simple merge