]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 05:34:50 +0000 (16:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 05:34:50 +0000 (16:34 +1100)
commitd7d93f0b8b9507aeebf3fca18c0b5437819082c7
tree25473977b4c2edec4a1efe34a8c08797f93a8843
parent19e3145ce7db35b2175fca3d04ddda8d96e3c20e
parent54ced00639aa90c92e0ce399cc84ca6fc6a2eebb
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/Kconfig
drivers/Makefile
drivers/misc/altera-stapl/altera.c
drivers/staging/brcm80211/brcmsmac/mac80211_if.c
drivers/staging/comedi/drivers/ni_labpc.c
drivers/staging/et131x/et1310_tx.c
drivers/staging/hv/Makefile
drivers/staging/rtl8192e/r8192E_core.c
drivers/staging/xgifb/XGI_main_26.c
drivers/staging/zram/zram_drv.c
22 files changed:
MAINTAINERS
drivers/Kconfig
drivers/Makefile
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/et1310_tx.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/wlags49_h2/wl_netdev.c
drivers/staging/xgifb/XGI_main_26.c
drivers/staging/zcache/zcache-main.c
drivers/staging/zram/zram_drv.c