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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 47f7950 c25a4a0)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 26 Mar 2013 02:44:41 +0000 (13:44 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 26 Mar 2013 02:44:41 +0000 (13:44 +1100)
commit	6d8ac49fd11d2d174268e7994c1db999544cbf5d
tree	5d9363fd94fbed2dd2515c6179fbb1488da4947a	tree \| snapshot
parent	47f7950d11e2542a016a08f618d57139205f66f6	commit \| diff
parent	c25a4a09c3fa3d4b058ac612d82ddfd172410fbb	commit \| diff

Merge remote-tracking branch 'trivial/for-next'

Conflicts:
Documentation/virtual/virtio-spec.txt

arch/arc/kernel/disasm.c	diff1 \|	diff2 \|	blob \| history
arch/s390/kvm/trace.h	diff1 \|	diff2 \|	blob \| history
drivers/ata/sata_fsl.c	diff1 \|	diff2 \|	blob \| history
drivers/crypto/caam/ctrl.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_dp.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_irq_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/isdn/i4l/isdn_tty.c	diff1 \|	diff2 \|	blob \| history
drivers/power/pm2301_charger.c	diff1 \|	diff2 \|	blob \| history
mm/hugetlb.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules