summaryrefslogtreecommitdiff
path: root/drivers/net/caif/caif_spi_slave.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-01-16 11:44:54 -0800
committerDavid S. Miller <davem@davemloft.net>2014-01-16 11:44:54 -0800
commit5ff1dd24168c6dda68d72897a847c364581744ae (patch)
tree0bfef71c2b98ad9cd2df6336a7df14eaf6e53b84 /drivers/net/caif/caif_spi_slave.c
parent89740ca74f5bb45d3e0dcb4aa9eab0ba9864bff5 (diff)
parent847c8e2959f7f8f1462e33c0a720c6267b984ed8 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nftables
Pablo Neira Ayuso says: ==================== This small batch contains several Netfilter fixes for your net-next tree, more specifically: * Fix compilation warning in nft_ct in NF_CONNTRACK_MARK is not set, from Kristian Evensen. * Add dependency to IPV6 for NF_TABLES_INET. This one has been reported by the several robots that are testing .config combinations, from Paul Gortmaker. * Fix default base chain policy setting in nf_tables, from myself. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/caif/caif_spi_slave.c')
0 files changed, 0 insertions, 0 deletions