From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 Jul 2012 18:26:48 +0000 (-0700)
Subject: Merge branch 'kmap_atomic' of git://github.com/congwang/linux
X-Git-Tag: Ubuntu-5.10.0-12.13~20957
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=84eda28060f7e7d5f91f81f928532af13b9e44b2;p=mirror_ubuntu-hirsute-kernel.git

Merge branch 'kmap_atomic' of git://github.com/congwang/linux

Pull final kmap_atomic cleanups from Cong Wang:
 "This should be the final round of cleanup, as the definitions of enum
  km_type finally get removed from the whole tree.  The patches have
  been in linux-next for a long time."

* 'kmap_atomic' of git://github.com/congwang/linux:
  pipe: remove KM_USER0 from comments
  vmalloc: remove KM_USER0 from comments
  feature-removal-schedule.txt: remove kmap_atomic(page, km_type)
  tile: remove km_type definitions
  um: remove km_type definitions
  asm-generic: remove km_type definitions
  avr32: remove km_type definitions
  frv: remove km_type definitions
  powerpc: remove km_type definitions
  arm: remove km_type definitions
  highmem: remove the deprecated form of kmap_atomic
  tile: remove usage of enum km_type
  frv: remove the second parameter of kmap_atomic_primary()
  jbd2: remove the second argument of kmap_atomic
---

84eda28060f7e7d5f91f81f928532af13b9e44b2