From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 31 Oct 2011 21:44:18 +0000 (+0100)
Subject: Merge branch 'depends/rmk/gpio' into next/fixes
X-Git-Tag: v3.2-rc1~99^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43872fa788060eef91ae437957e0a5e39f1c56fd;p=pandora-kernel.git

Merge branch 'depends/rmk/gpio' into next/fixes

This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

43872fa788060eef91ae437957e0a5e39f1c56fd
Reading git-diff-tree failed