]> 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, 24 Aug 2011 04:41:32 +0000 (14:41 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Aug 2011 04:41:32 +0000 (14:41 +1000)
commitc786e6ebfbc9d8f82c40aed1ae864070cc5ef305
treeae87f2b54b66e67196286ee2796173d3f2a0565e
parentfd90adc86cc82deae1d69efeeae5daae2e4a6d4b
parentac657d5884f31a16c900b2ad1098e01ec7fa4145
Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/xgifb/XGI_main_26.c
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
drivers/staging/et131x/et131x_netdev.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