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
..
cassini.c	Merge branch 'kmap_atomic' of git://github.com/congwang/linux	2012-03-21 09:40:26 -07:00
cassini.h
Kconfig
Makefile
niu.c	ethernet: unify return value of .ndo_set_mac_address if address is invalid	2012-02-23 17:03:20 -05:00
niu.h
sunbmac.c	netdev: ethernet dev_alloc_skb to netdev_alloc_skb	2012-02-08 18:46:38 -05:00
sunbmac.h
sungem.c	drivers/net: Remove alloc_etherdev error messages	2012-01-31 16:20:48 -05:00
sungem.h
sunhme.c	netdev: ethernet dev_alloc_skb to netdev_alloc_skb	2012-02-08 18:46:38 -05:00
sunhme.h
sunqe.c	sun/sunqe: print MAC via printk format specifier	2012-02-24 15:40:59 -05:00
sunqe.h
sunvnet.c	drivers/net: Remove alloc_etherdev error messages	2012-01-31 16:20:48 -05:00
sunvnet.h