fix merge, compilation errors related to:

[PATCH 3.17 22/25] USB: Add device quirk for ASUS T100 Base Station keyboard

&

USB: core: add device-qualifier quirk
Revert "[RFC 2/2] cpufreq: governor: CPU frequency scaled from task's cumulative-load on an idle wakeup"

This reverts commit 4d3f6144ee92be37d178701bff4bcc08810f4e4e.
Revert "[RFC 1/2] sched_fair: Add cumulative average of load_avg_contrib to a task"

This reverts commit d35fe362be09eec06d48dc9e84f445df762ae1eb.