projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 48d67fe 5f66d2b)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
authorLarry Finger <Larry.Finger@lwfinger.net>
Mon, 1 Aug 2011 17:33:12 +0000 (12:33 -0500)
committerLarry Finger <Larry.Finger@lwfinger.net>
Mon, 1 Aug 2011 17:33:12 +0000 (12:33 -0500)
commit275d38585c742acdd6b8ab20f2588552f04c5d31
tree24ef4aa0f79b94b8b2903e1e5ab2f48419aa879atree | snapshot (tar.gz zip)
parent48d67fe03511c8ded54c39561dfedbdf7c78c743commit | diff
parent5f66d2b58ca879e70740c82422354144845d6dd3commit | 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/et131x/et131x_netdev.c
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
drivers/staging/rtl8192e/r8192E.h
drivers/staging/usbip/userspace/src/utils.h
drivers/staging/usbip/userspace/src/utils.h diff1 | diff2 | blob | history
Motorola kernel-slsi