Skip to content
Commit 15ce9286 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'for_3.1/pm-fixes-2' of git://gitorious.org/khilman/linux-omap-pm into fixes

parents d035953e 126caf13
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment