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
..
afs_cm.h
afs_fs.h
afs_vl.h
afs.h
cache.c
callback.c
cell.c
cmservice.c
dir.c	switch ->create() to umode_t	2012-01-03 22:54:53 -05:00
file.c	AFS: checking wrong bit in afs_readpages()	2012-03-20 11:14:38 -07:00
flock.c
fsclient.c	afs: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:22 +08:00
inode.c
internal.h	afs: Read of file returns EBADMSG	2012-03-16 17:01:41 -07:00
Kconfig
main.c
Makefile
misc.c
mntpt.c	afs: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:22 +08:00
netdevices.c
proc.c
rxrpc.c	afs: Remote abort can cause BUG in rxrpc code	2012-03-16 17:01:41 -07:00
security.c
server.c
super.c
vlclient.c
vlocation.c
vnode.c
volume.c
write.c