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>
	Thu, 6 Oct 2011 05:04:26 +0000 (16:04 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 6 Oct 2011 05:04:26 +0000 (16:04 +1100)
commit	610999d346ab9aceefbf1975063328e715025dba
tree	4264fe5646bf8e930da0327f2db24e6ce8f794ef	tree \| snapshot
parent	5333ac2f22943c3c91ed984e5402d8fa6d6bf3db	commit \| diff
parent	93decf3661bf1c7c05bbc217d4e69222b557512a	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