]> git.karo-electronics.de Git - karo-tx-linux.git/commit
ARM: tegra: fix mismerges of header file inclusions
authorOlof Johansson <olof@lixom.net>
Sat, 22 Sep 2012 18:08:03 +0000 (11:08 -0700)
committerArnd Bergmann <arnd@arndb.de>
Tue, 2 Oct 2012 13:31:35 +0000 (15:31 +0200)
commit0d53d40da27d04a4fd260973f27330bcc0e1a20c
tree8f194a6588f81c1f92c0507d448476f4f1dfa9bf
parent947cabbdd5a7c3d617a942f03cf7a435a4e35168
ARM: tegra: fix mismerges of header file inclusions

Signed-off-by: Olof Johansson <olof@lixom.net>
drivers/mmc/host/sdhci-tegra.c