git.stricted.de - GitHub/MotorolaMobilityLLC/kernel-slsi.git/commit

projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit

author	Greg Kroah-Hartman <gregkh@suse.de>
	Wed, 2 Feb 2011 21:35:58 +0000 (13:35 -0800)
committer	Greg Kroah-Hartman <gregkh@suse.de>
	Wed, 2 Feb 2011 21:35:58 +0000 (13:35 -0800)
commit	949c3676cd6b2717c2abda5d9b10e6d6d7daf741
tree	f885084fc7061e072d4b0024256a5ab0cbb64c93	tree \| snapshot (tar.gz zip)
parent	836aded1613dc93bebe7b1d2710f4a416725db50	commit \| diff
parent	ebf53826e105f488f4f628703a108e98940d1dc5	commit \| diff

Staging: Merge branch 'staging-next' into 2.6.38-rc3

This was done to resolve conflicts in the following files due
to patches in Linus's tree and in the staging-next tree:
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c

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

Motorola kernel-slsi

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c	diff1 \|	\|	blob \| history
drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c	diff1 \|	\|	blob \| history
drivers/staging/hv/blkvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/netvsc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/netvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/adc/ad7476_core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8712/hal_init.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c	diff1 \|	diff2 \|	blob \| history