# # Makefile for MPLS. # obj-$(CONFIG_NET_MPLS_GSO) += mpls_gso.o obj-$(CONFIG_MPLS_ROUTING) += mpls_router.o obj-$(CONFIG_MPLS_IPTUNNEL) += mpls_iptunnel.o mpls_router-y := af_mpls.o /distanz.ch/favicon.ico'/>
summaryrefslogtreecommitdiff
path: root/sound/i2c/other
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-12-29 14:17:42 -0500
committerDavid S. Miller <davem@davemloft.net>2016-12-29 14:17:42 -0500
commite400b7977e7c014bc0c298b2d834311770a777ac (patch)
tree84bdd8093c8df46f66d88836732580e2d3e63acb /sound/i2c/other
parentf0c16ba8933ed217c2688b277410b2a37ba81591 (diff)
parent10b1c04e92229ebeb38ccd0dcf2b6d3ec73c0575 (diff)
Merge branch 'mlx4-misc-fixes'
Tariq Toukan says: ==================== mlx4 misc fixes This patchset contains several bug fixes from the team to the mlx4 Eth and Core drivers. Series generated against net commit: 60133867f1f1 'net: wan: slic_ds26522: fix spelling mistake: "configurated" -> "configured"' ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/i2c/other')