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>
	Mon, 30 Apr 2012 04:35:59 +0000 (14:35 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 30 Apr 2012 04:35:59 +0000 (14:35 +1000)
commit	8a8c3f0fbb978ce1ce6420265c9be9e451cc78aa
tree	cdc97cc917001c911dca27df05bbf2bdf307954c	tree \| snapshot
parent	00def2e1ee7f52abfbd8028126df980ed8d99e5b	commit \| diff
parent	db3b9e990e75573402cda22faf933760f076c033	commit \| diff

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

Conflicts:
drivers/Kconfig
drivers/Makefile
drivers/staging/android/Kconfig
drivers/staging/android/Makefile
drivers/staging/line6/driver.c
drivers/staging/vt6656/ioctl.c

24 files changed:

drivers/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/iio/inkern.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/persistent_ram.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/magnetometer/ak8975.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/magnetometer/hmc5843.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/as102/as102_usb_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/go7007/s2250-loader.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/octeon/ethernet-rx.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/octeon/ethernet-tx.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/octeon/ethernet.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/omapdrm/omap_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/ramster/cluster/tcp.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rts_pstor/ms.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rts_pstor/rtsx_transport.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/sep/sep_main.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vme/devices/vme_pio2_core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vt6656/ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/xgifb/vb_init.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/xgifb/vb_setmode.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/xgifb/vb_table.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/zsmalloc/zsmalloc-main.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

drivers/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/iio/inkern.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/persistent_ram.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/magnetometer/ak8975.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/iio/magnetometer/hmc5843.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/as102/as102_usb_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/go7007/s2250-loader.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/octeon/ethernet-rx.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/octeon/ethernet-tx.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/octeon/ethernet.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/omapdrm/omap_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/ramster/cluster/tcp.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rts_pstor/ms.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rts_pstor/rtsx_transport.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/sep/sep_main.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vme/devices/vme_pio2_core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vt6656/ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/xgifb/vb_init.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/xgifb/vb_setmode.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/xgifb/vb_table.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/zsmalloc/zsmalloc-main.c	diff1 \|	diff2 \|	blob \| history