]> 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, 1 Sep 2011 03:08:06 +0000 (13:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Sep 2011 03:08:06 +0000 (13:08 +1000)
commit5fe4e0f3b4dd0ec80f236fc9f122e42cffc26508
tree8f3e8633f4441819a4be53990687b32627c05c7f
parentde4179d46d5f339c36a9ea0bfe01be89cdf59a23
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