Merge branch 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Aug 2013 21:00:28 +0000 (14:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Aug 2013 21:00:28 +0000 (14:00 -0700)
Pull libata fix from Tejun Heo:
 "Just the addition of MODULE_DEVICE_TABLE() for a platform driver"

* 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  pata_imx: expose module alias for loading from device-tree


Trivial merge