From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 21 Oct 2011 14:46:26 +0000 (+0200)
Subject: Merge branch 'depends/rmk/gpio' into next/board
X-Git-Tag: v3.2-rc1~93^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=335332770c68649ffeaf5dc2b58d9cd40041e295;p=pandora-kernel.git

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

Conflicts:
	arch/arm/mach-at91/board-usb-a9260.c
	arch/arm/mach-at91/board-usb-a9263.c
	arch/arm/mach-tegra/board-paz00.h
	arch/arm/mach-tegra/board-seaboard.h
---

335332770c68649ffeaf5dc2b58d9cd40041e295
Reading git-diff-tree failed