summaryrefslogtreecommitdiff
path: root/sound/soc/rockchip
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-09 22:59:36 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-09 22:59:36 -0500
commita507c346b7fdc97296fa74626df49fdb7296a04e (patch)
treee1a5001b3df43bc608a143fc16c6a7f2ff039807 /sound/soc/rockchip
parent9878f60240f786286ebfaa8ff9227ef38da1720c (diff)
parent316d4d78cf9b6795b83f97c45368748741df418c (diff)
Merge branch 'openvswitch-Conntrack-integration-improvements'
Diffstat (limited to 'sound/soc/rockchip')
0 files changed, 0 insertions, 0 deletions
@goodmis.org> Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> Cc: Josh Triplett <josh@joshtriplett.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Jiri Kosina <jkosina@suse.cz> Cc: Borislav Petkov <bp@suse.de> Cc: Michal Hocko <mhocko@suse.cz> Cc: Vlastimil Babka <vbabka@suse.cz> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat