git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 20 Sep 2011 06:46:30 +0000 (16:46 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 20 Sep 2011 06:46:30 +0000 (16:46 +1000)
commit	94caefc1e21ccd1a806f67e198a8e21f6b7f6a50
tree	6152729e880b8646c1b69549296c711a4cad8a11	tree \| snapshot
parent	7bc77ec9523540a4e7b354126acc0f58b2f90450	commit \| diff
parent	7cbf3c7cd59288fb5e9f31815c74773549668d43	commit \| diff

Merge remote-tracking branch 'staging/staging-next'

Conflicts:
drivers/staging/comedi/drivers/ni_labpc.c
drivers/staging/rtl8192e/r8192E_core.c
drivers/staging/xgifb/XGI_main_26.c

Linux kernel for KaRo TX COM modules

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmfmac/dhd_linux.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/drivers/ni_labpc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/et131x/et131x_netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/staging/hv/netvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/addac/adt7316-i2c.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/dds/ad9832.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vt6655/device_main.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vt6656/main_usb.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/xgifb/XGI_main_26.c	diff1 \|	diff2 \|	blob \| history