Merge branch 'devel-gpio' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Fri, 10 Dec 2010 19:37:47 +0000 (11:37 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 10 Dec 2010 19:37:47 +0000 (11:37 -0800)

Trivial merge