Merge branch 'drm-ttm-unmappable' into drm-core-next
[pandora-kernel.git] / drivers / regulator / max8925-regulator.c
Simple merge