Most of the infrastructure that 'perf' uses here has been reused from the Git project, as of version: 66996ec: Sync with 1.6.2.4 Here is an (incomplete!) list of main contributors to those files in util/* and elsewhere: Alex Riesen Christian Couder Dmitry Potapov Jeff King Johannes Schindelin Johannes Sixt Junio C Hamano Linus Torvalds Matthias Kestenholz Michal Ostrowski Miklos Vajna Petr Baudis Pierre Habouzit René Scharfe Samuel Tardieu Shawn O. Pearce Steffen Prohaska Steve Haslam Thanks guys! The full history of the files can be found in the upstream Git commits. git Git repository'/>
summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/sigmadsp.h
diff options
context:
space:
mode:
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/sigmadsp.h
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/sigmadsp.h')