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)
commite4ef108fcde0b97ed38923ba1ea06c7a152bab9e
tree628062eeaa08c0f91c108734d430126f1a63adee
parent8e28921e5e3c1760167faad53bcdb6cfa1aa0806
parent71ab1d58c26eb7c30711caa95c173d5c39ab8855
Merge branch 'for-3.11-fixes' of git://git./linux/kernel/git/tj/libata

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