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
..
af_rds.c	rds: Make rds_sock_lock BH rather than IRQ safe.	2012-01-24 17:03:44 -05:00
bind.c	net/rds: use prink_ratelimited() instead of printk_ratelimit()	2011-06-17 00:03:03 -04:00
cong.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
connection.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
ib.c	net: Fix files explicitly needing to include module.h	2011-10-31 19:30:28 -04:00
ib.h	net: remove interrupt.h inclusion from netdevice.h	2011-06-06 22:55:11 -07:00
ib_cm.c	net: Convert vmalloc/memset to vzalloc	2011-09-15 13:59:25 +02:00
ib_rdma.c	net, rds, Replace xlist in net/rds/xlist.h with llist	2011-09-15 15:36:32 -04:00
ib_recv.c	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
ib_ring.c
ib_send.c	net/rds: use prink_ratelimited() instead of printk_ratelimit()	2011-06-17 00:03:03 -04:00
ib_stats.c
ib_sysctl.c
info.c	rds: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:28 +08:00
info.h
iw.c	net: Fix files explicitly needing to include module.h	2011-10-31 19:30:28 -04:00
iw.h	net: remove interrupt.h inclusion from netdevice.h	2011-06-06 22:55:11 -07:00
iw_cm.c	net/rds: use prink_ratelimited() instead of printk_ratelimit()	2011-06-17 00:03:03 -04:00
iw_rdma.c	RDS: Remove some unused iWARP code	2012-01-12 20:05:28 -08:00
iw_recv.c	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
iw_ring.c
iw_send.c	net/rds: use prink_ratelimited() instead of printk_ratelimit()	2011-06-17 00:03:03 -04:00
iw_stats.c
iw_sysctl.c
Kconfig	rds: drop "select LLIST"	2011-11-14 00:10:50 -05:00
loop.c	rds: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:28 +08:00
loop.h
Makefile	Net: rds: Makefile: Remove deprecated items	2010-11-22 08:16:15 -08:00
message.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
page.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
rdma.c	rds: Integer overflow in RDS cmsg handling	2010-11-17 12:20:52 -08:00
rdma_transport.c	net: Fix files explicitly needing to include module.h	2011-10-31 19:30:28 -04:00
rdma_transport.h
rds.h	rds: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:28 +08:00
recv.c	rds: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:28 +08:00
send.c	Remove printk from rds_sendmsg	2012-03-20 16:12:11 -04:00
stats.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
sysctl.c
tcp.c	net: Fix files explicitly needing to include module.h	2011-10-31 19:30:28 -04:00
tcp.h
tcp_connect.c
tcp_listen.c
tcp_recv.c	rds: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:28 +08:00
tcp_send.c
tcp_stats.c	net: rds: fix const array syntax	2011-07-01 16:16:19 -07:00
threads.c	net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules	2011-10-31 19:30:30 -04:00
transport.c