Stephen Rothwell wrote:
Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in
sound/soc/pxa/e800_wm9712.c between commit
f638d6ae54b5dc1bbffaa1dd94cb288d989670af ("[ARM] pxa: remove unnecessary
#include of pxa-regs.h and hardware.h") from the pxa tree and commit 0465c7aa6fbab89de820442aed449ceb8d9145a6 ("ASoC: machine driver for
Toshiba e800") from the sound tree.
Just overlapping context changes. I fixed it up (see below) and can
carry the fix as necessary.
Looks good. If it needs acking, then
Acked-by: Ian Molton <ian@xxxxxxxxxxxxxx>
-Ian
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
