Merge branch 'devel-gpio'
authorTony Lindgren <tony@atomide.com>
Wed, 1 Dec 2010 21:56:37 +0000 (13:56 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 1 Dec 2010 21:56:37 +0000 (13:56 -0800)

Trivial merge