]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'spi-v3.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 Nov 2014 01:55:42 +0000 (17:55 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 Nov 2014 01:55:42 +0000 (17:55 -0800)
commit190fc9d9686283465bfa45e7a25cff0e05cc99e4
treef38b6ccd7b40778a8e4e32bb7a2052016e094482
parent0210bb6083e655981ebe9ea2fc6a4ab4e96d4bff
parentec058615f1fbc03837ab048b1bb7291370b46cef
Merge tag 'spi-v3.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

Pull spi fixes from Mark Brown:
 "There's a couple of driver fixes here, plus one core fix for the DMA
  mapping which wasn't doing the right thing for vmalloc()ed addresses
  that hadn't been through kmap().  It's fairly rare to use vmalloc()
  with SPI and it's a subset of those users who might fail so it's
  unsurprising that this wasn't noticed sooner"

* tag 'spi-v3.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: sirf: fix word width configuration
  spi: Fix mapping from vmalloc-ed buffer to scatter list
  spi: dw: Fix dynamic speed change.