diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-07-24 05:42:34 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-07-24 05:42:34 -0400 |
| commit | 43cbd286fbba4bfb0c2ef05dc62522dfd5a2c000 (patch) | |
| tree | 7184a24f04c72987e725e50e66db530e6f618220 /mm/memcontrol.c | |
| parent | fee4b700a4e9e446151eb5a03874ca8666323113 (diff) | |
| parent | c5ae4dca11523dff15cfb1763b64a71b805976aa (diff) | |
Merge tag 'asoc-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.11
A few small updates again, the sgtl5000 one fixes some newly triggered
issues due to some probe ordering changes which were introduced in the
last merge window.
Diffstat (limited to 'mm/memcontrol.c')
| -rw-r--r-- | mm/memcontrol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index d12ca6f3c293..00a7a664b9c1 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
| @@ -2522,7 +2522,7 @@ static void mem_cgroup_drain_pcp_counter(struct mem_cgroup *memcg, int cpu) | |||
| 2522 | spin_unlock(&memcg->pcp_counter_lock); | 2522 | spin_unlock(&memcg->pcp_counter_lock); |
| 2523 | } | 2523 | } |
| 2524 | 2524 | ||
| 2525 | static int __cpuinit memcg_cpu_hotplug_callback(struct notifier_block *nb, | 2525 | static int memcg_cpu_hotplug_callback(struct notifier_block *nb, |
| 2526 | unsigned long action, | 2526 | unsigned long action, |
| 2527 | void *hcpu) | 2527 | void *hcpu) |
| 2528 | { | 2528 | { |