tree bd2f84361699651cce5661bcfe60e3fe5ee91517
parent 1a0703ede4493bd74f9c6b53f782b749e175a88e
parent 2de0dbc5f6830e7659083d1929f57cb88b16a3b6
author Grant Likely <grant.likely@secretlab.ca> 1325786751 -0700
committer Grant Likely <grant.likely@secretlab.ca> 1325786751 -0700

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

Conflicts:
	drivers/gpio/gpio-pl061.c