summaryrefslogtreecommitdiff
path: root/tools/testing/selftests/powerpc/ptrace/.gitignore
blob: 349acfafc95b6f020af259d01f8ca44268927723 (plain)
1
2
3
4
5
6
7
8
9
10
ptrace-gpr
ptrace-tm-gpr
ptrace-tm-spd-gpr
ptrace-tar
ptrace-tm-tar
ptrace-tm-spd-tar
ptrace-vsx
ptrace-tm-vsx
ptrace-tm-spd-vsx
ptrace-tm-spr
();'>
authorDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
commit3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch)
treef4abe2f05e173023d2a262afd4aebb1e89fe6985 /sound/soc/codecs/wm2000.c
parent76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)
parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/soc/codecs/wm2000.c')