From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 18 Feb 2011 20:11:27 +0000 (-0800)
Subject: Merge 2.6.38-rc5 into staging-next
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=80ae3fa5d6712ef3625eff617f72e190645d6361;p=linux-edison.git

Merge 2.6.38-rc5 into staging-next

This is to resolve a merge conflict with:
	drivers/staging/zram/zram_drv.c
as pointed out by Stephen Rothwell

Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Robert Jennings <rcj@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

80ae3fa5d6712ef3625eff617f72e190645d6361
diff --cc drivers/staging/zram/zram_drv.c
index 1017d6df17d,4bd8cbdaee7..5fdf9d2fc95
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@@ -237,7 -235,8 +238,8 @@@ static void zram_read(struct zram *zram
  		if (unlikely(!zram->table[index].page)) {
  			pr_debug("Read before write: sector=%lu, size=%u",
  				(ulong)(bio->bi_sector), bio->bi_size);
 -			/* Do nothing */
 +			handle_zero_page(page);
+ 			index++;
  			continue;
  		}