Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Feb 2011 15:59:48 +0000 (07:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Feb 2011 15:59:48 +0000 (07:59 -0800)
commit091994cfb8e7d7a372c2d547778a91012d899e16
tree71c6d214f9287bb61d24345a93b60579937a711b
parentd8ed516f82f0f4cda11282450512310ab273637e
parentc170093d31bd4e3bc51881cc0f123beeca7872c9
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

* 'spi/merge' of git://git.secretlab.ca/git/linux-2.6:
  devicetree-discuss is moderated for non-subscribers
  MAINTAINERS: Add entry for GPIO subsystem
  dt: add documentation of ARM dt boot interface
  dt: Remove obsolete description of powerpc boot interface
  dt: Move device tree documentation out of powerpc directory
  spi/spi_sh_msiof: fix wrong address calculation, which leads to an Oops
MAINTAINERS