From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Nov 2010 11:50:43 +0000 (-0400)
Subject: Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
X-Git-Url: https://git.stricted.de/?p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git;a=commitdiff_plain;h=90ae83f7fc32733e5829d806306c0c590f1a383f

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

90ae83f7fc32733e5829d806306c0c590f1a383f