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
..
ieee80211	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
authors
changes
copying
dot11d.h
ieee80211_crypt.h
Kconfig	staging/rtl81*: build as loadable modules only	2011-04-04 22:46:15 -07:00
Makefile
r819xU_cmdpkt.c
r819xU_cmdpkt.h
r819xU_firmware_img.c
r819xU_firmware_img.h
r819xU_firmware.c	staging: rtl8192u: declare MODULE_FIRMWARE	2011-08-02 16:07:50 -07:00
r819xU_firmware.h
r819xU_HTGen.h
r819xU_HTType.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
r819xU_phy.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
r819xU_phy.h
r819xU_phyreg.h
r8180_93cx6.c
r8180_93cx6.h
r8180_pm.c
r8180_pm.h
r8190_rtl8256.c
r8190_rtl8256.h
r8192U_core.c	Staging: rtl8712/rtl8192u: move USB device ID within staging drivers.	2012-03-02 16:36:38 -08:00
r8192U_dm.c
r8192U_dm.h
r8192U_hw.h
r8192U_wx.c
r8192U_wx.h
r8192U.h	Remove unneeded version.h includes from drivers/staging/rtl*/	2011-07-05 10:39:40 -07:00