From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Sep 2010 19:45:50 +0000 (-0700)
Subject: Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v4.14-rc1~17622
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6142811a3395188bac6fa4f5c4223471b1ac98a8;p=platform%2Fkernel%2Flinux-rpi.git

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: move probe call to subsys_initcall()
  powerpc/5200: mpc52xx_uart.c: Add of_node_put to avoid memory leak
  spi/pl022: fix APB pclk power regression on U300
  spi/spi_s3c64xx: Warn if PIO transfers time out
  spi/s3c64xx: Fix incorrect reuse of 'val' local variable.
  spi/s3c64xx: Fix compilation warning
  spi/dw_spi: clean the cs_control code
  spi/dw_spi: Allow interrupt sharing
  spi/spi_s3c64xx: Increase dead reckoning time in wait_for_xfer()
  spi/spi_s3c64xx: Move to subsys_initcall()
  spi: free children in spi_unregister_master, not siblings
  gpiolib: Add 'struct gpio_chip' forward declaration for !GPIOLIB case
  of: Fix missing includes - ll_temac
  spi/spi_s3c64xx: Staticise non-exported functions
  spi/spi_s3c64xx: Make probe more robust against missing board config
---

6142811a3395188bac6fa4f5c4223471b1ac98a8