projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e1703b3 45b583b)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
authorLarry Finger <Larry.Finger@lwfinger.net>
Tue, 26 Jul 2011 20:52:24 +0000 (15:52 -0500)
committerLarry Finger <Larry.Finger@lwfinger.net>
Tue, 26 Jul 2011 20:52:24 +0000 (15:52 -0500)
commit48d67fe03511c8ded54c39561dfedbdf7c78c743
treee8aa39f29bda0fa6b39fd7271b2e172b89d8031atree | snapshot (tar.gz zip)
parente1703b329f7c7ea82ea181dc4c50020f25061a2ccommit | diff
parent45b583b10a8b438b970e95a7d1d4db22c9e35004commit | diff
Merge branch 'master' of git://git./linux/kernel/git/gregkh/staging-2.6

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/usbip/userspace/src/utils.h
23 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/staging/ath6kl/os/linux/include/ar6000_drv.h diff1 | diff2 | blob | history
drivers/staging/brcm80211/brcmfmac/dhd_linux.c diff1 | diff2 | blob | history
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c diff1 | diff2 | blob | history
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h diff1 | diff2 | blob | history
drivers/staging/brcm80211/brcmsmac/mac80211_if.c diff1 | | blob | history
drivers/staging/brcm80211/brcmsmac/mac80211_if.h diff1 | | blob | history
drivers/staging/et131x/et131x_netdev.c diff1 | 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_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/usbip/userspace/src/utils.h diff1 | diff2 | blob | history
drivers/staging/wlags49_h2/wl_internal.h diff1 | diff2 | blob | history
Motorola kernel-slsi