tree fd9be0ecbb4baa6385aa1a75af7ced5f7d691be4
parent 59db5b2b9e0327e545ff5764dadcb26062c2ab1f
parent 85e2efbb1db9a18d218006706d6e4fbeb0216213
author Greg Kroah-Hartman <gregkh@suse.de> 1298059887 -0800
committer Greg Kroah-Hartman <gregkh@suse.de> 1298059887 -0800

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>