Merge branch 'integration-2.6.38-for-tony' of git://git.pwsan.com/linux-2.6 into...
authorTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 19:32:24 +0000 (11:32 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 19:32:24 +0000 (11:32 -0800)
commit808601b75804475c9022f6375e76b7c62c99a10a
tree355a3100269e88460e36f251ef0ce2f1ed88d52e
parentc10abbb26513f4ccff89c4d80912cb4d36fcd3e8
parentf17f9726c27c3921e00a5750e85070e6dd7e1ff7
Merge branch 'integration-2.6.38-for-tony' of git://git.pwsan.com/linux-2.6 into omap-for-linus
arch/arm/mach-omap2/board-devkit8000.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/control.h