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
..
apparmor	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
integrity	ima: fix cred sparse warning	2012-01-19 15:59:11 +11:00
keys	Merge git://git.samba.org/sfrench/cifs-2.6	2012-01-23 08:59:49 -08:00
selinux	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
smack
tomoyo	tomoyo: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:28 +08:00
capability.c	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
commoncap.c	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
device_cgroup.c	cgroup: remove cgroup_subsys argument from callbacks	2012-02-02 09:20:22 -08:00
inode.c
Kconfig
lsm_audit.c	audit: no leading space in audit_log_d_path prefix	2012-01-17 16:17:04 -05:00
Makefile
min_addr.c
security.c	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00