review.tizen.org Git - platform/kernel/kernel-mfld-blackbay.git/commit

projects / platform / kernel / kernel-mfld-blackbay.git / commit

author	Greg Kroah-Hartman <gregkh@suse.de>
	Fri, 18 Feb 2011 20:11:27 +0000 (12:11 -0800)
committer	Greg Kroah-Hartman <gregkh@suse.de>
	Fri, 18 Feb 2011 20:11:27 +0000 (12:11 -0800)
commit	80ae3fa5d6712ef3625eff617f72e190645d6361
tree	fd9be0ecbb4baa6385aa1a75af7ced5f7d691be4	tree \| snapshot
parent	59db5b2b9e0327e545ff5764dadcb26062c2ab1f	commit \| diff
parent	85e2efbb1db9a18d218006706d6e4fbeb0216213	commit \| diff

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>

Domain: System / Uncategorized;

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmsmac/wlc_pub.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/netvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/zram/zram_drv.c	diff1 \|	diff2 \|	blob \| history