summaryrefslogtreecommitdiff
path: root/.vim/syntax/udev.vim
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2010-11-18 17:40:17 +0100
committerTobias Klauser <tklauser@distanz.ch>2010-11-18 17:40:17 +0100
commit9e0dc61499ae7ee85be743289cc7775a45cb6605 (patch)
tree0f6eea4adae6ee06c222bc56ce7a8d0e7003625a /.vim/syntax/udev.vim
parent1df9306b5b5f0456ee9927930628522e7f41de39 (diff)
Add lua ftplugin
Diffstat (limited to '.vim/syntax/udev.vim')
0 files changed, 0 insertions, 0 deletions
colspan='2' class='oid'>76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (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/max98357a.c')