]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'omap-for-v3.8/cleanup-headers-menelaus' into omap-for-v3.8/cleanup...
authorTony Lindgren <tony@atomide.com>
Thu, 25 Oct 2012 19:21:48 +0000 (12:21 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 25 Oct 2012 19:21:48 +0000 (12:21 -0700)
commit640a740cf95b9f946a8154af61165c0e0282fdd0
tree5a3962136d574d05a788f0fbac0f36c528efc699
parentd0cce7af0a48cf86ca0a26a8702ae845d6130cd5
parent35b6e0ea5f51740d87aedbce04524ee1b1b20093
Merge branch 'omap-for-v3.8/cleanup-headers-menelaus' into omap-for-v3.8/cleanup-headers

Conflicts:
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-n8x0.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-n8x0.c