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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
Simple merge

diff --cc drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
Simple merge

diff --cc drivers/staging/brcm80211/brcmsmac/wlc_pub.h
Simple merge

diff --cc drivers/staging/hv/netvsc_drv.c
Simple merge

diff --cc drivers/staging/zram/zram_drv.c
index 1017d6d,4bd8cbd..5fdf9d2
--- 1/drivers/staging/zram/zram_drv.c
--- 2/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;
                }