]> rtime.felk.cvut.cz Git - can-eth-gw-linux.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)
commit2da8a79f7d81853d00b6a00621aeef7545196084
tree5a3962136d574d05a788f0fbac0f36c528efc699
parent6d02643d64b4440394ee462ea4b870c8506cd9e7
parent7bd3b61853da6d2fc579e27c7a1ac1e9fc968d1a
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