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: 07c6528 278cee0)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 19 Jun 2013 04:16:25 +0000 (14:16 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 19 Jun 2013 04:16:25 +0000 (14:16 +1000)
commit	32dc1c70ab2bbc1d1fee86ae8676651a96c9e24a
tree	b2493f3a52e39b427049f3d0b757b72a0d8aa345	tree \| snapshot
parent	07c6528b1c275789b053feca6901dcbc7008766e	commit \| diff
parent	278cee0515a3b3abb0d4e614d969b5be35c2c288	commit \| diff

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

Conflicts:
Documentation/networking/netlink_mmap.txt

14 files changed:

Documentation/DocBook/drm.tmpl	diff1 \|	diff2 \|	blob \| history
Documentation/bcache.txt	diff1 \|	diff2 \|	blob \| history
Documentation/media-framework.txt	diff1 \|	diff2 \|	blob \| history
Documentation/virtual/kvm/api.txt	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/s3c2416-cpufreq.c	diff1 \|	diff2 \|	blob \| history
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/mei/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/nfc/pn533.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/pm8001/pm80xx_hwi.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_error.c	diff1 \|	diff2 \|	blob \| history
include/linux/cpu.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules