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
..
amcc	crypto: convert drivers/crypto/* to use module_platform_driver()	2011-11-30 16:12:48 +08:00
caam	crypto: caam - remove DECO access initialization code	2011-12-20 15:20:05 +08:00
geode-aes.c	crypto: geode_aes - Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)	2010-07-19 13:50:21 +08:00
geode-aes.h	[CRYPTO] geode: do not copy the IV too often	2008-01-11 08:16:26 +11:00
hifn_795x.c	crypto: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:16 +08:00
ixp4xx_crypto.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
Kconfig	crypto: Make hifn_795x build depend on !ARCH_DMA_ADDR_T_64BIT	2011-10-21 14:28:57 +02:00
Makefile	crypto: s5p-sss - add S5PV210 advanced crypto engine support	2011-04-08 20:40:51 +08:00
mv_cesa.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2012-03-03 09:31:49 -08:00
mv_cesa.h	crypto: mv_cesa - Add sha1 and hmac(sha1) async hash drivers	2010-04-13 16:50:49 +08:00
n2_asm.S	crypto: n2 - Add Niagara2 crypto driver	2010-05-19 14:14:04 +10:00
n2_core.c	crypto: n2 - Fix a get/put_cpu() imbalance	2011-08-15 15:20:19 +08:00
n2_core.h	crypto: n2 - Add Niagara2 crypto driver	2010-05-19 14:14:04 +10:00
omap-aes.c	crypto: omap-aes - don't treat NULL clk as an error	2011-01-29 15:57:32 +11:00
omap-sham.c	crypto: omap-sham - do not schedule tasklet if there is no active requests	2011-06-30 07:44:05 +08:00
padlock-aes.c	crypto: Add support for x86 cpuid auto loading for x86 crypto drivers	2012-01-26 16:48:10 -08:00
padlock-sha.c	crypto: Add support for x86 cpuid auto loading for x86 crypto drivers	2012-01-26 16:48:10 -08:00
picoxcell_crypto_regs.h	crypto: picoxcell - add support for the picoxcell crypto engines	2011-02-21 22:42:40 +11:00
picoxcell_crypto.c	crypto: picoxcell - fix boolean and / or confusion	2011-12-20 15:20:05 +08:00
s5p-sss.c	crypto: convert drivers/crypto/* to use module_platform_driver()	2011-11-30 16:12:48 +08:00
talitos.c	crypto: talitos - convert talitos_error to struct device	2011-12-20 15:20:02 +08:00
talitos.h	crypto: talitos - support for channel remap and 2nd IRQ	2011-11-21 16:21:51 +08:00