summaryrefslogtreecommitdiff
path: root/cpusched.h
diff options
context:
space:
mode:
Diffstat (limited to 'cpusched.h')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-20 15:31:41 +0000
fc191d02e5b /sound/soc/soc-jack.c parentf030d60b30855e18ac5bf080fa9e576147623d18 (diff)parentb3c27b51db9112d03864fdef44fa611dd69c1425 (diff)
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch. Conflicts: sound/soc/codecs/wm8994.c
Diffstat (limited to 'sound/soc/soc-jack.c')