Merge omap-testing
authorTony Lindgren <tony@atomide.com>
Wed, 7 Jul 2010 12:40:09 +0000 (15:40 +0300)
committerTony Lindgren <tony@atomide.com>
Wed, 7 Jul 2010 12:40:09 +0000 (15:40 +0300)
commit796978cb43ee9af4d6d34c6d1df94672c945e885
tree2390c855ea505b7e1a45649e7697586fc1580702
parenta64f6d41aaa97a14951176c0a1efd71f6d199657
parent165d9bd9114423977d25078f59f27fd87edc2bc6
Merge omap-testing

Conflicts:
arch/arm/mach-omap2/board-n8x0.c
arch/arm/Kconfig
arch/arm/mach-omap1/board-nokia770.c
arch/arm/mach-omap2/board-n8x0.c
arch/arm/mm/Kconfig