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
..
aoe
drbd	drbd: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:29 +08:00
mtip32xx
paride
xen-blkback
amiflop.c
ataflop.c
brd.c	block: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:16 +08:00
cciss_cmd.h
cciss_scsi.c
cciss_scsi.h
cciss.c
cciss.h
cpqarray.c
cpqarray.h
cryptoloop.c
DAC960.c	drivers/block/DAC960: fix -Wuninitialized warning	2012-03-02 10:48:35 +01:00
DAC960.h
floppy.c	floppy/scsi: fix setting of BIO flags	2012-03-05 15:49:43 -08:00
hd.c
ida_cmd.h
ida_ioctl.h
Kconfig	usb/ub: deprecate & schedule for removal the "Low Performance USB Block" driver	2012-03-16 13:30:10 -07:00
loop.c	block: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:16 +08:00
Makefile
mg_disk.c
nbd.c
nvme.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
osdblk.c
pktcdvd.c	block: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:16 +08:00
ps3disk.c
ps3vram.c
rbd_types.h
rbd.c
smart1,2.h
sunvdc.c
swim3.c
swim_asm.S
swim.c
sx8.c	block, sx8: fix pointer math issue getting fw version	2012-03-03 19:44:39 +01:00
ub.c	usb/ub: deprecate & schedule for removal the "Low Performance USB Block" driver	2012-03-16 13:30:10 -07:00
umem.c
umem.h
viodasd.c
virtio_blk.c
xd.c
xd.h
xen-blkfront.c
xsysace.c
z2ram.c