git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c16f69d a8c7687)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 2 Apr 2013 03:17:37 +0000 (14:17 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 2 Apr 2013 03:17:37 +0000 (14:17 +1100)
commit	4bde9f59835e26c71f03f010b2d7f85b815c7422
tree	9617af89be90c5ea4d977303f8aba98b469a10b8	tree \| snapshot
parent	c16f69dfff1fb11b74e3b4c59ad6428c346f68a1	commit \| diff
parent	a8c7687bf21603af6246e55cc58f98e42241bd01	commit \| diff

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

Conflicts:
drivers/char/virtio_console.c

drivers/char/hw_random/virtio-rng.c	diff1 \|	diff2 \|	blob \| history
drivers/char/virtio_console.c	diff1 \|	diff2 \|	blob \| history
drivers/net/caif/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/caif/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
include/linux/scatterlist.h	diff1 \|	diff2 \|	blob \| history
include/linux/virtio.h	diff1 \|	diff2 \|	blob \| history
net/9p/trans_virtio.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules