From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Dec 2010 21:00:37 +0000 (-0800)
Subject: Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v2.6.37-rc8~14
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d3c7e1ab043abd7706db4fbccf327df9e62f7990;p=~shefty%2Frdma-dev.git

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

* 'merge' of git://git.secretlab.ca/git/linux-2.6:
  spi/mpc52xx-spi: fix annotation for remove()-pointer
  spi/fsl_espi: fix wrong setting of the address in the command buffer
  spi/fsl_espi: change the read behaviour of the SPIRF
  of/i2c: Fix request module by alias
  powerpc/mpc5200: include fs.h in mpc52xx_gpt.c
---

d3c7e1ab043abd7706db4fbccf327df9e62f7990