]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Jul 2012 15:34:16 +0000 (08:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Jul 2012 15:34:16 +0000 (08:34 -0700)
Pull cpumask changes from Rusty Russell:
 "Trivial comment changes to cpumask code.  I guess it's getting boring."

Boring is good.

* tag 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  cpumask: cpulist_parse() comments correction
  init: add comments to keep initcall-names in sync with initcall levels
  cpumask: add a few comments of cpumask functions

1  2 
init/main.c

diff --cc init/main.c
Simple merge