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)
commitfda87903f4e9caf87e02d52768c2611e417b7efb
treebd2f84361699651cce5661bcfe60e3fe5ee91517
parent1a0703ede4493bd74f9c6b53f782b749e175a88e
parent2de0dbc5f6830e7659083d1929f57cb88b16a3b6
Merge branch 'gpio-for-grant' of git://sources.calxeda.com/kernel/linux into gpio/next

Conflicts:
drivers/gpio/gpio-pl061.c
MAINTAINERS
drivers/gpio/Kconfig
drivers/gpio/gpio-da9052.c
drivers/gpio/gpio-pl061.c