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
..
aops.c	ntfs: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:25 +08:00
aops.h
attrib.c	ntfs: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:25 +08:00
attrib.h
bitmap.c
bitmap.h
collate.c
collate.h
compress.c
debug.c
debug.h	treewide: use __printf not __attribute__((format(printf,...)))	2011-10-31 17:30:54 -07:00
dir.c
dir.h
endian.h
file.c	ntfs: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:25 +08:00
index.c
index.h
inode.c	vfs: switch ->show_options() to struct dentry *	2012-01-06 23:19:54 -05:00
inode.h	vfs: switch ->show_options() to struct dentry *	2012-01-06 23:19:54 -05:00
Kconfig
layout.h	Typos: change aditional to additional.	2012-02-21 11:40:36 +01:00
lcnalloc.c
lcnalloc.h
logfile.c
logfile.h
Makefile
malloc.h
mft.c	NTFS: Correct two spelling errors "dealocate" to "deallocate" in mft.c.	2012-02-24 09:17:09 +00:00
mft.h
mst.c
namei.c
ntfs.h
quota.c
quota.h
runlist.c
runlist.h
super.c	ntfs: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:25 +08:00
sysctl.c
sysctl.h
time.h
types.h
unistr.c
upcase.c
usnjrnl.c
usnjrnl.h
volume.h	ntfs: propagate umode_t	2012-01-03 22:55:08 -05:00