Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Apr 2010 16:57:55 +0000 (09:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Apr 2010 16:57:55 +0000 (09:57 -0700)
commit8f2adb7cab81fc4984ddfe3a1efd1b62d52bead8
tree75f48007900d3386cfaa0e9d5ad460f6c51f1635
parent66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8
parent95b1ed2ac7ffe3205afc6f5a20320fbdb984da92
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