Merge branch 'gpio-for-grant' of git://sources.calxeda.com/kernel/linux into gpio...
authorGrant Likely <grant.likely@secretlab.ca>
Thu, 5 Jan 2012 18:05:51 +0000 (11:05 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 5 Jan 2012 18:05:51 +0000 (11:05 -0700)
Conflicts:
drivers/gpio/gpio-pl061.c


Trivial merge