From: Grant Likely <grant.likely@secretlab.ca>
Date: Thu, 5 Jan 2012 18:05:51 +0000 (-0700)
Subject: Merge branch 'gpio-for-grant' of git://sources.calxeda.com/kernel/linux into gpio... 
X-Git-Tag: v3.3-rc1~64^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fda87903f4e9caf87e02d52768c2611e417b7efb;p=pandora-kernel.git

Merge branch 'gpio-for-grant' of git://sources.calxeda.com/kernel/linux into gpio/next

Conflicts:
	drivers/gpio/gpio-pl061.c
---

fda87903f4e9caf87e02d52768c2611e417b7efb
Reading git-diff-tree failed