]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit49ce9e5327e40fddeadfefa1f1a75af1eec2e596
treedc4ad4ef1365009e1dbb09baf2238db74132022c
parente17a556adb027411c15c3d6c9d057001e6fbb845
parentb226c257e593c0b6cbb13a41d3054ca10ce425b3
Merge branch 'merge-spi' of git://git.secretlab.ca/git/linux-2.6

* '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