Merge tag 'dm-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Aug 2013 17:43:00 +0000 (10:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Aug 2013 17:43:00 +0000 (10:43 -0700)
commitee7075d45f57f90a42e61e016562ce8065668201
treed0204e0b40921edbcf6c0fbcfe2c7439aa7d7323
parent41aacc1eea645c99edbe8fbcf78a97dc9b862adc
parentb936bf8b785f0fbe083d203049e4da1c56ec788f
Merge tag 'dm-3.11-fixes' of git://git./linux/kernel/git/device-mapper/linux-dm

Pull device mapper fix from Mike Snitzer:
 "A patch to fix dm-cache-policy-mq's remove_mapping() conflict with
  sparc32"

* tag 'dm-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm cache: avoid conflicting remove_mapping() in mq policy