Linus Torvalds 9f3938346a Merge branch 'kmap_atomic' of git://github.com/congwang/linux
Pull kmap_atomic cleanup from Cong Wang.

It's been in -next for a long time, and it gets rid of the (no longer
used) second argument to k[un]map_atomic().

Fix up a few trivial conflicts in various drivers, and do an "evil
merge" to catch some new uses that have come in since Cong's tree.

* 'kmap_atomic' of git://github.com/congwang/linux: (59 commits)
  feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal
  highmem: kill all __kmap_atomic() [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename]
  drbd: remove the second argument of k[un]map_atomic()
  zcache: remove the second argument of k[un]map_atomic()
  gma500: remove the second argument of k[un]map_atomic()
  dm: remove the second argument of k[un]map_atomic()
  tomoyo: remove the second argument of k[un]map_atomic()
  sunrpc: remove the second argument of k[un]map_atomic()
  rds: remove the second argument of k[un]map_atomic()
  net: remove the second argument of k[un]map_atomic()
  mm: remove the second argument of k[un]map_atomic()
  lib: remove the second argument of k[un]map_atomic()
  power: remove the second argument of k[un]map_atomic()
  kdb: remove the second argument of k[un]map_atomic()
  udf: remove the second argument of k[un]map_atomic()
  ubifs: remove the second argument of k[un]map_atomic()
  squashfs: remove the second argument of k[un]map_atomic()
  reiserfs: remove the second argument of k[un]map_atomic()
  ocfs2: remove the second argument of k[un]map_atomic()
  ntfs: remove the second argument of k[un]map_atomic()
  ...
2012-03-21 09:40:26 -07:00
..
2009-03-13 01:18:56 -04:00
2011-07-26 16:49:47 -07:00
2012-03-20 21:48:30 +08:00
2009-01-05 19:11:05 +00:00
2011-09-27 18:08:04 +02:00
2009-07-03 03:34:06 +00:00
2011-03-31 11:26:23 -03:00
2009-12-16 07:20:12 -08:00
2009-12-16 03:48:54 +00:00
2011-07-18 13:08:00 -05:00
2009-03-13 01:20:48 -04:00
2010-10-07 14:08:55 +01:00
2010-08-14 22:26:51 +02:00
2010-06-09 11:12:36 +02:00
2011-01-13 17:32:47 -08:00
2011-07-26 16:49:47 -07:00
2011-07-26 16:49:43 -07:00
2009-02-01 11:01:27 +05:30
2009-09-27 23:07:23 -04:00
2010-10-07 14:08:55 +01:00
2012-01-03 22:55:17 -05:00
2011-07-31 18:18:08 -05:00