diff options
Diffstat (limited to 'sound/soc/codecs/tas2552.h')
| parent | bd041733c9f612b66c519e5a8b1a98b05b94ed24 (diff) | |
|---|---|---|
Merge branch 'akpm' (patches from Andrew)
Merge more fixes from Andrew Morton:
"2 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm, vmscan: add cond_resched() into shrink_node_memcg()
mm: workingset: fix NULL ptr in count_shadow_nodes
Diffstat (limited to 'fs/xfs')