]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2011 05:37:53 +0000 (15:37 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2011 05:37:53 +0000 (15:37 +1000)
commite80698a64a63bbbe6a8beb8eb100af3764191fe1
tree8e2ab9fdf2ea2af4029b0b22662704d24a709f51
parenta019e5ccb87412b42b31fc29df4e79df98a96ab4
parent7cbf3c7cd59288fb5e9f31815c74773549668d43
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/rtl8192e/r8192E_core.c
drivers/staging/xgifb/XGI_main_26.c
MAINTAINERS
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
drivers/staging/et131x/et131x_netdev.c
drivers/staging/hv/netvsc_drv.c
drivers/staging/vt6655/device_main.c
drivers/staging/vt6656/main_usb.c
drivers/staging/xgifb/XGI_main_26.c