]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:34:02 +0000 (11:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 01:34:02 +0000 (11:34 +1000)
commitaf49dc02ea1b970a5d09e905213b82a3020daea9
tree9a7bcbe5540f313ffebc3488a7d41086951cb1db
parent759e4051d905b40d3067ea62bc745ee91d1564f9
parent6623b4194459c07859d3e3196c3994fa7be5b88e
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c
12 files changed:
MAINTAINERS
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/am4372.dtsi
arch/arm/boot/dts/armada-xp-matrix.dts
arch/sparc/include/asm/checksum_32.h
arch/sparc/include/asm/checksum_64.h
drivers/clk/ti/clk-43xx.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/s390/net/qeth_core_main.c
include/uapi/linux/audit.h
kernel/sysctl.c
lib/Kconfig.debug