]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/firmware/pcdp.h
projects / mv-sheeva.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 47c5ba5 65289d6)
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Nov 2010 11:50:43 +0000 (07:50 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Nov 2010 11:50:43 +0000 (07:50 -0400)
commit90ae83f7fc32733e5829d806306c0c590f1a383f
tree5b4cd7290c70d9899ca7caa99998395218b15cabtree | snapshot
parent47c5ba53bc5e5f88b5d1bbb97acd25afc27f74ebcommit | diff
parent65289d6345d93abd860e43fd2119ac176d6cc697commit | diff
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

* 'next-spi' of git://git.secretlab.ca/git/linux-2.6:
  spi/pl022: fix erroneous platform data in U300
  spi: fixed odd static string conventions in core code
  spi/bfin_spi: only request GPIO on first load
  spi/bfin_spi: handle error/status changes after data interrupts
  spi: enable spi_board_info to be registered after spi_master
Linux for Marvell Sheeva based platforms