git.agner.ch Git - linux-drm-fsl-dcu.git/commit

projects / linux-drm-fsl-dcu.git / commit

author	Greg Kroah-Hartman <gregkh@suse.de>
	Thu, 4 Mar 2010 16:39:02 +0000 (08:39 -0800)
committer	Greg Kroah-Hartman <gregkh@suse.de>
	Thu, 4 Mar 2010 16:39:02 +0000 (08:39 -0800)
commit	f341dddf1dadf64be309791f83d7904245f1261d
tree	974c9e1f23da6743532162fd86cf019da497eaff	tree \| snapshot
parent	eaa5eec739637f32f8733d528ff0b94fd62b1214	commit \| diff
parent	b02957d58a27525499ab10d272d3b44682a7ae50	commit \| diff

Staging: merge staging patches into Linus's main branch

There were a number of patches that went into Linus's
tree already that conflicted with other changes in the
staging branch. This merge resolves those merge conflicts.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

16 files changed:

drivers/staging/et131x/et131x_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/go7007/s2250-board.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/blkvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/phison/phison.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8187se/ieee80211/ieee80211.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8187se/r8180_core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192su/ieee80211/ieee80211.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192su/r8192U_core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/slicoss/slicoss.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/sm7xx/smtcfb.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vt6655/device_main.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/wlags49_h2/wl_netdev.c	diff1 \|	diff2 \|	blob \| history

Freescale DCU DRM driver

RSS Atom

drivers/staging/et131x/et131x_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/go7007/s2250-board.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/blkvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/phison/phison.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8187se/ieee80211/ieee80211.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8187se/r8180_core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192su/ieee80211/ieee80211.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192su/r8192U_core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/slicoss/slicoss.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/sm7xx/smtcfb.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vt6655/device_main.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/wlags49_h2/wl_netdev.c	diff1 \|	diff2 \|	blob \| history