aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-10-11 18:23:02 -0400
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2012-11-15 08:37:47 -0500
commitdb6364a650edcb076786092c7f85f1e1cdae8b20 (patch)
treef7bd44c6086f7ce768ccef95c27ef6a5145538cf /.mailmap
parent6d7b42a447f92eb3e7e410bbf62042693eb040f7 (diff)
ARM: nomadik: fixup some FSMC merge problems
Due to a clash between refactoring and due to loss of a header file that remained in my working tree the Nomadik stopped compiling after switching to the FSMC driver. This patch fixes it up. Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions