]> git.karo-electronics.de Git - mv-sheeva.git/commit
Merge branch 'sh/sdhi-mfd'
authorPaul Mundt <lethal@linux-sh.org>
Mon, 26 Oct 2009 01:47:44 +0000 (10:47 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 26 Oct 2009 01:47:44 +0000 (10:47 +0900)
commit15893fb565921507da80e500d85bb2575989bb57
tree16473cd98b2b4dd43f55d4880a7b42973f2f6bd0
parentf32154c9b580f11017b01bf093514c900c09364e
parent96987d96f0058d8689a2b8ac288dbff2e6d85563
Merge branch 'sh/sdhi-mfd'

Conflicts:
arch/sh/boards/mach-ecovec24/setup.c
arch/sh/boards/mach-kfr2r09/setup.c
arch/sh/boards/mach-ecovec24/setup.c
arch/sh/boards/mach-kfr2r09/setup.c