Merge branch 'gpio-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...
authorTony Lindgren <tony@atomide.com>
Wed, 12 May 2010 00:26:01 +0000 (17:26 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 12 May 2010 00:26:01 +0000 (17:26 -0700)

Trivial merge