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
..
Kconfig	staging: zcache: make zcache builtin only	2012-03-07 13:30:17 -08:00
Makefile	staging: fix zcache building	2011-08-02 16:06:18 -07:00
tmem.c	Staging: zcache: signedness bug in tmem_get()	2011-08-23 14:52:20 -07:00
tmem.h	staging/zmem: Use lockdep_assert_held instead of spin_is_locked	2012-03-16 14:47:41 -07:00
zcache-main.c	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00