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, 11 Oct 2011 07:44:32 +0000 (18:44 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 11 Oct 2011 07:44:32 +0000 (18:44 +1100)
commit	ed7de3eee1990439eeaabb788fd3d964b02e46b8
tree	3fc79dc3b4b7e9429dc38c9eb3dc95f40349c8b2	tree \| snapshot
parent	d9ab700a386af3a77d5c5c8387fc3c2a43982a4c	commit \| diff
parent	76e5f8135d63eb784ef44438e46e82cf0329e179	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/et131x/et1310_tx.c
drivers/staging/rtl8192e/r8192E_core.c
drivers/staging/xgifb/XGI_main_26.c
drivers/staging/zram/zram_drv.c

20 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/et1310_tx.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/et1310_tx.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