]> 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, 5 Sep 2011 06:41:50 +0000 (16:41 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 06:41:50 +0000 (16:41 +1000)
commit04e59c22a3d9273f6841eb30088e4a7252a38b52
tree26e12d58478ab93db5b4f24676373903d45bb320
parentc6018cc58283feebf5b52c15be3b417a238eed86
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