]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'trivial/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 04:27:22 +0000 (14:27 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 04:27:22 +0000 (14:27 +1000)
commit176dd8b7c73cd775bce1e8120d4f07fa0916f455
treecfd62cf2714ac64694a3ff93e255856ed715a772
parent80cf45b8f1ea05c8ab8d6e9cfd7acfbf4ef79ed2
parenta15e41909ccf535e568ea311cf926a1924ad63d6
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
Documentation/networking/netlink_mmap.txt
18 files changed:
Documentation/DocBook/drm.tmpl
Documentation/bcache.txt
Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt
Documentation/media-framework.txt
Documentation/sysctl/net.txt
Documentation/virtual/kvm/api.txt
drivers/cpufreq/s3c2416-cpufreq.c
drivers/infiniband/ulp/isert/ib_isert.c
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
drivers/misc/mei/init.c
drivers/net/ethernet/mellanox/mlx4/main.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
drivers/net/wireless/ath/ath9k/Kconfig
drivers/nfc/pn533.c
drivers/scsi/libiscsi_tcp.c
drivers/scsi/pm8001/pm80xx_hwi.c
drivers/scsi/scsi_error.c
include/linux/cpu.h