]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Tue, 24 Mar 2009 01:02:12 +0000 (18:02 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 24 Mar 2009 01:02:12 +0000 (18:02 -0700)
commit90e758af52ba803cba233fabee81176d99589f09
tree6bf800cd33b599aab730bf8e81e1bae732c6e651
parent3404491eb5a3232dc33b131da470840f4cc76a32
parent8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/plat-omap/include/mach/common.h
arch/arm/plat-omap/include/mach/pm.h
Makefile
arch/arm/plat-omap/include/mach/pm.h