summaryrefslogtreecommitdiff
path: root/trafgen
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-03-27 09:30:24 +0100
committerDaniel Borkmann <dborkman@redhat.com>2013-03-27 09:30:24 +0100
commit12dc4152b5397b3d00f81a8c27853eae15ed5f9c (patch)
tree19b7fb9346b1a74da5b74780bf8eeefba5874e11 /trafgen
parent7ffa9cc1715108ab89292aeffc392688af1f74da (diff)
trafgen: lexer: return if no needle found
Also return if no needle has been found in the shell code haystack. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'trafgen')
0 files changed, 0 insertions, 0 deletions
e0e70e6452b971a69cc9794ff4a6715c11f7f2'>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 'include/sound/hdmi-codec.h')