tree f4e2815758d5dd15f75a6c1523c1abc50966cdcb
parent d3d381c6365ef5b06c4184a3fe047cf027533970
parent 68d4778c701b7e22ddfd64e3afb6628c92718ad2
author Tony Lindgren <tony@atomide.com> 1251930185 -0700
committer Tony Lindgren <tony@atomide.com> 1251930185 -0700

Merge branch 'pm-upstream/debug' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-next