Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
include/linux/platform_data/mmc-omap.h between commit 69bc0b677e6c ("mmc:
omap_hsmmc: Enable HSPE bit for high speed cards") from the tree and
commit 53db20d123f7 ("mmc: omap: Remove cpu_is_omap usage from the
driver") from
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
include/linux/platform_data/mmc-omap.h between commit 69bc0b677e6c (mmc:
omap_hsmmc: Enable HSPE bit for high speed cards) from the tree and
commit 53db20d123f7 (mmc: omap: Remove cpu_is_omap usage from the
driver) from the
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mmc/host/omap.c between commit 2976837c6ea8 ("mmc: omap: remove
unused variables and includes") from the mmc tree and commits
cf3a6ec2c0a4 ("ARM: OMAP: remove plat/board.h file") and 70c494c3122f
("ARM: OMAP1: Make
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mmc/host/omap.c between commit 2976837c6ea8 (mmc: omap: remove
unused variables and includes) from the mmc tree and commits
cf3a6ec2c0a4 (ARM: OMAP: remove plat/board.h file) and 70c494c3122f
(ARM: OMAP1: Make
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mmc/host/omap.c between commit 2976837c6ea8 ("mmc: omap: remove
unused variables and includes") from the mmc tree and commit cf3a6ec2c0a4
("ARM: OMAP: remove plat/board.h file") from the arm-soc tree.
The latter is a
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mmc/host/omap.c between commit 2976837c6ea8 (mmc: omap: remove
unused variables and includes) from the mmc tree and commit cf3a6ec2c0a4
(ARM: OMAP: remove plat/board.h file) from the arm-soc tree.
The latter is a
6 matches
Mail list logo
