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: 93fb643 07f4225)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 21 Mar 2013 03:11:14 +0000 (14:11 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 21 Mar 2013 03:11:14 +0000 (14:11 +1100)
commit	12656abe40e8906fea487caf97b6eff795874299
tree	3690f29426d54c10d1ebbf87fd4331b625d47478	tree \| snapshot
parent	93fb6437715f2d9356620e14c758362b7d0ebcb5	commit \| diff
parent	07f42258893d3768deb9a24165d23f1355bc1949	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/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
fs/f2fs/f2fs.h	diff1 \|	diff2 \|	blob \| history
fs/f2fs/super.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules