git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 26 Jul 2011 04:37:29 +0000 (14:37 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 26 Jul 2011 04:37:36 +0000 (14:37 +1000)
commit	bd7dbb4f3634fe798b1e501835193367241e036b
tree	4d67935457b3399d17eb330e3c97575237c29d21	tree \| snapshot
parent	b075a9fa98c35dc91dbb62f0b3656975fe7e1277	commit \| diff
parent	e1703b329f7c7ea82ea181dc4c50020f25061a2c	commit \| diff

Merge remote-tracking branch 'staging/staging-next'

Conflicts:
Documentation/feature-removal-schedule.txt
drivers/staging/bcm/headers.h
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
drivers/staging/brcm80211/brcmfmac/wl_iw.c
drivers/staging/et131x/et131x_netdev.c
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
drivers/staging/rtl8192e/r8192E.h
drivers/staging/tm6000/tm6000-alsa.c
drivers/staging/usbip/userspace/src/utils.h

27 files changed:

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/staging/ath6kl/os/linux/include/ar6000_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/bcm/headers.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmfmac/dhd_linux.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmsmac/mac80211_if.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmsmac/mac80211_if.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/cxd2099/cxd2099.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/gma500/mrst_hdmi.c	\|	diff2 \|	blob \| history
drivers/staging/gma500/psb_intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/hv_mouse.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lirc/lirc_zilog.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/rtl8192e/ieee80211/ieee80211.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192e/ieee80211/ieee80211_module.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192e/r8192E.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192e/r8192E_core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192u/ieee80211/ieee80211.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192u/ieee80211/ieee80211_module.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192u/r8192U_core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8712/osdep_service.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/sep/sep_driver.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/tm6000/tm6000-alsa.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/wlags49_h2/wl_internal.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/xgifb/XGI_main_26.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/storage/Kconfig	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/staging/ath6kl/os/linux/include/ar6000_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/bcm/headers.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmfmac/dhd_linux.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmsmac/mac80211_if.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmsmac/mac80211_if.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/cxd2099/cxd2099.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/gma500/mrst_hdmi.c	\|	diff2 \|	blob \| history
drivers/staging/gma500/psb_intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/hv_mouse.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lirc/lirc_zilog.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/rtl8192e/ieee80211/ieee80211.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192e/ieee80211/ieee80211_module.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192e/r8192E.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192e/r8192E_core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192u/ieee80211/ieee80211.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192u/ieee80211/ieee80211_module.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8192u/r8192U_core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8712/osdep_service.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/sep/sep_driver.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/tm6000/tm6000-alsa.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/wlags49_h2/wl_internal.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/xgifb/XGI_main_26.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/storage/Kconfig	diff1 \|	diff2 \|	blob \| history