From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Apr 2010 16:57:55 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8f2adb7cab81fc4984ddfe3a1efd1b62d52bead8;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6

* 'merge' of git://git.secretlab.ca/git/linux-2.6:
  spi: spidev_test gives error upon 1-byte transfer
  omap2_mcspi: small fixes of output data format
  omap2_mcspi: Flush posted writes
  spi: spi_device memory should be released instead of device.
  spi: release device claimed by bus_find_device_by_name
  of: check for IS_ERR()
  serial/mpc52xx_uart: Drop outdated comments
  gpio: potential null dereference
---

8f2adb7cab81fc4984ddfe3a1efd1b62d52bead8