]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'merge-spi' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Dec 2010 18:07:44 +0000 (10:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Dec 2010 18:07:44 +0000 (10:07 -0800)
* 'merge-spi' of git://git.secretlab.ca/git/linux-2.6:
  spi/m68knommu: Coldfire QSPI platform support
  spi/omap2_mcspi.c: Force CS to be in inactive state after off-mode transition


Trivial merge