Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Dec 2010 21:00:37 +0000 (13:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Dec 2010 21:00:37 +0000 (13:00 -0800)
commitd3c7e1ab043abd7706db4fbccf327df9e62f7990
tree793aec926c57da1e364e04163199262364c627b0
parentdfe80f63293ece364795c2e87805882c9ec3a266
parent4bdac7da5237170b1392f39ebee99d235043fad8
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