tree 660dbb75b3f91b07b1c21ec3d44d70d606bb648f
parent b0092f2665be3dd04f923d09a6a0deeddb4e96ec
parent 7fcca715de3438b8fc3c8a144702f3a95c8ff63c
author Grant Likely <grant.likely@secretlab.ca> 1332492486 +0000
committer Grant Likely <grant.likely@secretlab.ca> 1332492486 +0000

Merge branch 'for_3.4/fixes/gpio-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next