]> 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, 12 Sep 2011 05:05:37 +0000 (15:05 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 05:05:37 +0000 (15:05 +1000)
commitdb2f5aa593b26311afa131ccb2990bc054d0831c
treed4755996a3876b288ba7712ddda8e67ebd1c7a50
parent4cfb0670112cb28510034fb31f3e01a758d4d751
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