From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 Apr 2012 15:53:24 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://github.com/rustyrussell/linux
X-Git-Tag: MMI-PSA29.97-13-9~17081
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=deb74f5ca1f22f9e1c5da93143a250dbb96535af;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'for-linus' of git://github.com/rustyrussell/linux

Pull cpumask cleanups from Rusty Russell:
 "(Somehow forgot to send this out; it's been sitting in linux-next, and
  if you don't want it, it can sit there another cycle)"

I'm a sucker for things that actually delete lines of code.

Fix up trivial conflict in arch/arm/kernel/kprobes.c, where Rusty fixed
a user of &cpu_online_map to be cpu_online_mask, but that code got
deleted by commit b21d55e98ac2 ("ARM: 7332/1: extract out code patch
function from kprobes").

* tag 'for-linus' of git://github.com/rustyrussell/linux:
  cpumask: remove old cpu_*_map.
  documentation: remove references to cpu_*_map.
  drivers/cpufreq/db8500-cpufreq: remove references to cpu_*_map.
  remove references to cpu_*_map in arch/
---

deb74f5ca1f22f9e1c5da93143a250dbb96535af