git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dfe80f6 4bdac7d)
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)
* '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


Trivial merge
Pandora Kernel Repository