Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

diff --cc Documentation/filesystems/proc.txt
Simple merge

diff --cc drivers/mmc/card/block.c
index 4f98f8b3839552899434261a8284e3fa7c88826e,9aca9462a12fa0e056d877040abf0b06c0667ae9..9cf08651d2bf805c587ddfcd08acc2dea0c06507
--- 1/drivers/mmc/card/block.c
--- 2/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@@ -1937,12 -1931,8 +1937,13 @@@ static int mmc_blk_issue_rq(struct mmc_
        struct mmc_card *card = md->queue.card;
        struct mmc_host *host = card->host;
        unsigned long flags;
+       unsigned int cmd_flags = req ? req->cmd_flags : 0;
  
 +#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME
 +      if (mmc_bus_needs_resume(card->host))
 +              mmc_resume_bus(card->host);
 +#endif
 +
        if (req && !mq->mqrq_prev->req)
                /* claim host only for the first request */
                mmc_claim_host(card->host);

diff --cc fs/fuse/dev.c
Simple merge

diff --cc fs/nfs/nfs4proc.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc mm/vmscan.c
Simple merge