Merge branch '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6

[pandora-kernel.git] / drivers / gpu / drm / i915 / intel_opregion.c

diff --cc drivers/gpu/drm/i915/intel_opregion.c
Simple merge