]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 26 Sep 2011 06:40:13 +0000 (16:40 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 26 Sep 2011 06:40:13 +0000 (16:40 +1000)
commitac79e59be6f325f9b4ddf316f0653fe268d440f1
tree966d98649a0d2d73821080c692e005f7940191f1
parent4ec5741a792437bfd4942599c553b6c84bc2044d
parent7cbf3c7cd59288fb5e9f31815c74773549668d43
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/comedi/drivers/ni_labpc.c
drivers/staging/rtl8192e/r8192E_core.c
drivers/staging/xgifb/XGI_main_26.c
13 files changed:
MAINTAINERS
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
drivers/staging/comedi/drivers/ni_labpc.c
drivers/staging/et131x/et131x_netdev.c
drivers/staging/hv/Makefile
drivers/staging/hv/netvsc_drv.c
drivers/staging/iio/addac/adt7316-i2c.c
drivers/staging/iio/dds/ad9832.c
drivers/staging/vt6655/device_main.c
drivers/staging/vt6656/main_usb.c
drivers/staging/xgifb/XGI_main_26.c
drivers/staging/zcache/zcache-main.c
drivers/staging/zram/zram_drv.c