Merge branch 'android-4.9' into amlogic-4.9-dev

Conflicts:
	arch/arm/configs/s3c2410_defconfig
	drivers/mmc/core/mmc.c

Signed-off-by: Victor Wan <victor.wan@amlogic.com>

diff --cc Makefile
Simple merge

diff --cc drivers/gpio/gpiolib.c
Simple merge

diff --cc drivers/mmc/core/mmc.c
index 51deb93,3d89655..f67201e
--- 1/drivers/mmc/core/mmc.c
--- 2/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@@ -1759,12 -1704,7 +1759,12 @@@ static int mmc_init_card(struct mmc_hos
                err = mmc_select_hs400(card);
                if (err)
                        goto free_card;
-       } else {
 +#ifdef AMLOGIC_HS400_TIMING
 +              err = mmc_hs400_timming(card);
 +              if (err)
 +                      goto err;
 +#endif
+       } else if (!mmc_card_hs400es(card)) {
                /* Select the desired bus width optionally */
                err = mmc_select_bus_width(card);
                if (err > 0 && mmc_card_hs(card)) {

diff --cc drivers/net/phy/phy_device.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge