Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git] / drivers / input / misc / adxl34x.c
Simple merge