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-Tag: v2.6.39-rc1~469^2~587
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80ae3fa5d6712ef3625eff617f72e190645d6361;p=pandora-kernel.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
Reading git-diff-tree failed