tree 5f413376f00e774abbc14a25cfc2047ac37ad846
parent df760137ad3cbfa15ceed42478f81bff01b6e799
parent d009559a4215c71694b1a29ec0e520453087a9f6
author Tony Lindgren <tony@atomide.com> 1274378854 -0700
committer Tony Lindgren <tony@atomide.com> 1274378854 -0700

Merge branch 'gpio-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus