diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:07:34 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:07:34 -0400 |
| commit | 935d918046d4c29f053d56fff67d6a21495fd780 (patch) | |
| tree | 5f413376f00e774abbc14a25cfc2047ac37ad846 /fs/proc | |
| parent | df760137ad3cbfa15ceed42478f81bff01b6e799 (diff) | |
| parent | d009559a4215c71694b1a29ec0e520453087a9f6 (diff) | |
Merge branch 'gpio-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'fs/proc')
0 files changed, 0 insertions, 0 deletions