Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Sun, 16 Aug 2009 15:53:44 +0000 (18:53 +0300)
committerTony Lindgren <tony@atomide.com>
Sun, 16 Aug 2009 15:53:44 +0000 (18:53 +0300)
Conflicts:
arch/arm/mach-omap2/serial.c


Trivial merge