Merge branch 'gpio-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...
authorTony Lindgren <tony@atomide.com>
Thu, 20 May 2010 18:07:34 +0000 (11:07 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 20 May 2010 18:07:34 +0000 (11:07 -0700)

Trivial merge