]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 05:35:34 +0000 (15:35 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 05:35:34 +0000 (15:35 +1000)
commit8b8349dac813bdf2f16dfbe623a90a700eb2a21e
tree01b0e6c88a3c60ba3f59ac31a1c8e8d7bd03dd3c
parent23e0648f9bdd6694f9d62b87683ae8038da4c89d
parent7cbf3c7cd59288fb5e9f31815c74773549668d43
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/misc/altera-stapl/altera.c
drivers/staging/comedi/drivers/ni_labpc.c
drivers/staging/rtl8192e/r8192E_core.c
drivers/staging/xgifb/XGI_main_26.c
18 files changed:
MAINTAINERS
drivers/misc/altera-stapl/altera.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
drivers/staging/brcm80211/brcmsmac/mac80211_if.c
drivers/staging/comedi/drivers/ni_labpc.c
drivers/staging/dt3155v4l/dt3155v4l.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