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, 5 Oct 2011 07:18:46 +0000 (18:18 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 5 Oct 2011 07:18:46 +0000 (18:18 +1100)
commit	c1d7df1e92aab71d2f50ef068c173def821c02c8
tree	1d00de304280d5a03a4afcbcd705e57ee01440c2	tree \| snapshot
parent	d0ca991444f87db91c5f0b82ca624c025dc71d5a	commit \| diff
parent	8481085a83af02397ed0bf29c2bce517c9287f32	commit \| diff

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

Conflicts:
drivers/misc/altera-stapl/altera.c
drivers/staging/brcm80211/brcmsmac/mac80211_if.c
drivers/staging/comedi/drivers/ni_labpc.c
drivers/staging/rtl8192e/r8192E_core.c
drivers/staging/xgifb/XGI_main_26.c
drivers/staging/zram/zram_drv.c

19 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/misc/altera-stapl/altera.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmfmac/dhd_linux.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmsmac/mac80211_if.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/drivers/ni_labpc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/dt3155v4l/dt3155v4l.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/wlags49_h2/wl_netdev.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
drivers/staging/zram/zram_drv.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/misc/altera-stapl/altera.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmfmac/dhd_linux.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/brcm80211/brcmsmac/mac80211_if.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/comedi/drivers/ni_labpc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/dt3155v4l/dt3155v4l.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/wlags49_h2/wl_netdev.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
drivers/staging/zram/zram_drv.c	diff1 \|	diff2 \|	blob \| history