Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Mar 2012 01:23:45 +0000 (17:23 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Mar 2012 01:23:45 +0000 (17:23 -0800)
commit7d77696e924bf09d83d83354ce57aa11d3ad61de
treef7da2babda1713ef293baa4ab840962d4a9594df
parent42a6c7ef3b204ef9bfd0e5b65ccd8c67f4a6cedf
parenta5ab6291b1fc73e0dc71caf2eaa0de1de7b11aaa
Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6

Pull SPI section mismatch bug fix for v3.3-rc3 from Grant Likely:
 "Minor fix for pl022_dma_probe() function which was put in the wrong
  section."

* tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  Fix section mismatch in spi-pl022.c