Merge branch 'pm-sr' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman...
authorTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 23:08:05 +0000 (15:08 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 23:08:05 +0000 (15:08 -0800)
commit1c4655651f1377297425525b250b2e4b5462015b
treed06ca3731ce50ca63914f175fa5c9accd51c2b13
parentf400c82efb474b2ccf01c796b60b36408f7845a3
parentb35cecf978e33bf8f4be0f36ffe00fe10f381c4a
Merge branch 'pm-sr' of ssh:///linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
arch/arm/mach-omap2/control.h