Merge branch 'master' into upstream
[pandora-kernel.git] / drivers / hid / hid-egalax.c
Simple merge