Merge branch 'for_3.5/fixes/gpio-2' of git://git.kernel.org/pub/scm/linux/kernel...
authorTony Lindgren <tony@atomide.com>
Fri, 18 May 2012 00:06:08 +0000 (17:06 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 18 May 2012 00:06:08 +0000 (17:06 -0700)

Trivial merge