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>
	Wed, 21 Sep 2011 04:50:07 +0000 (14:50 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 Sep 2011 04:50:07 +0000 (14:50 +1000)
commit	af5868da94d3aeae54bb82a5e938f5738ae11726
tree	0f9966af12e155dcf160fa15c8400135b2bf1c52	tree \| snapshot
parent	860ab5ed9ba77788d2864c8b4433c0575e0708f5	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

12 files changed:

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
drivers/staging/zcache/zcache-main.c	diff1 \|	diff2 \|	blob \| history