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
..
drivers	UML net: set addr_assign_type if random_ether_addr() used	2012-02-17 16:05:03 -05:00
include	freezer: remove now unused TIF_FREEZE	2011-11-21 12:32:25 -08:00
kernel	um: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:15 +08:00
os-Linux	um: unify ptrace_user.h	2011-11-02 14:15:27 +01:00
scripts	um: take arch/um/sys-x86 to arch/x86/um	2011-11-02 14:15:05 +01:00
sys-ia64
sys-ppc	um: change to new flag variables	2011-03-17 14:02:57 +01:00
.gitignore
defconfig	time: Cleanup old CONFIG_GENERIC_TIME references that snuck in	2011-10-04 13:07:47 -07:00
Kconfig.char	um: clean Kconfig up a bit	2011-11-02 14:15:29 +01:00
Kconfig.common	cpu: Register a generic CPU device on architectures that currently do not	2012-01-11 15:50:11 -08:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Kconfig.net	Fix common misspellings	2011-03-31 11:26:23 -03:00
Kconfig.rest	um: switch to use of drivers/Kconfig	2011-11-02 14:15:41 +01:00
Kconfig.um	um: clean Kconfig up a bit	2011-11-02 14:15:29 +01:00
Makefile	um: Use $(srctree) not $(KBUILD_SRC)	2011-12-09 10:59:59 -08:00
Makefile-ia64
Makefile-os-Linux
Makefile-ppc
Makefile-skas