From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 13 Feb 2011 15:59:48 +0000 (-0800)
Subject: Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v2.6.38-rc5~20
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=091994cfb8e7d7a372c2d547778a91012d899e16;p=linux-2.6-block.git

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
---

091994cfb8e7d7a372c2d547778a91012d899e16