Merge tag 'iwlwifi-for-kalle-2015-06-12' of https://git.kernel.org/pub/scm/linux...
[pandora-kernel.git] / drivers / md / dm-thin-metadata.c
Simple merge