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
..
ivtv-cards.c	[media] ivtv: Add Adaptec Remote Controller	2010-12-30 12:17:08 -02:00
ivtv-cards.h	[media] ivtv: Add Adaptec Remote Controller	2010-12-30 12:17:08 -02:00
ivtv-controls.c	V4L/DVB: ivtv: convert to the new control framework	2010-08-08 23:43:06 -03:00
ivtv-controls.h	V4L/DVB: ivtv: convert to the new control framework	2010-08-08 23:43:06 -03:00
ivtv-driver.c	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-01-18 12:53:54 -08:00
ivtv-driver.h	[media] ivtv: remove open_id/id from the filehandle code	2012-01-16 10:00:10 -02:00
ivtv-fileops.c	[media] ivtv: remove open_id/id from the filehandle code	2012-01-16 10:00:10 -02:00
ivtv-fileops.h
ivtv-firmware.c	[media] ivtv: Internally separate encoder & decoder standard setting	2011-06-01 08:46:38 -03:00
ivtv-firmware.h	V4L/DVB: ivtv: Add firmare monitoring and debug mode to ignore firmware problems	2010-08-02 14:47:55 -03:00
ivtv-gpio.c	V4L/DVB: ivtv: convert gpio subdev to new control framework	2010-08-08 23:43:05 -03:00
ivtv-gpio.h
ivtv-i2c.c	[media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap	2011-03-22 19:24:17 -03:00
ivtv-i2c.h	[media] video: Drop undue references to i2c-algo-bit	2011-11-24 15:11:17 -02:00
ivtv-ioctl.c	[media] ivtv: switch to the v4l core lock	2012-01-16 09:59:43 -02:00
ivtv-ioctl.h	[media] ivtv: Internally separate encoder & decoder standard setting	2011-06-01 08:46:38 -03:00
ivtv-irq.c	[media] ivtv: remove open_id/id from the filehandle code	2012-01-16 10:00:10 -02:00
ivtv-irq.h	ivtv: use kthread_worker instead of workqueue	2010-06-29 10:07:09 +02:00
ivtv-mailbox.c	V4L/DVB: ivtv: Automatic firmware reload	2010-08-02 14:48:13 -03:00
ivtv-mailbox.h	V4L/DVB: ivtv: Automatic firmware reload	2010-08-02 14:48:13 -03:00
ivtv-queue.c	ivtv: Fix PCI DMA direction	2009-06-05 08:05:23 -07:00
ivtv-queue.h
ivtv-routing.c	V4L/DVB (11380): v4l2-subdev: change s_routing prototype	2009-04-06 21:44:27 -03:00
ivtv-routing.h
ivtv-streams.c	[media] ivtv: remove open_id/id from the filehandle code	2012-01-16 10:00:10 -02:00
ivtv-streams.h
ivtv-udma.c	media: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:18 +08:00
ivtv-udma.h
ivtv-vbi.c	[media] ivtv: Internally separate encoder & decoder standard setting	2011-06-01 08:46:38 -03:00
ivtv-vbi.h	[media] ivtv: Return EFAULT when copy_from_user() fails in ivtv_write_vbi_from_user()	2010-12-29 08:17:10 -02:00
ivtv-version.h	[media] ivtv,cx18: Use default version control for VIDIOC_QUERYCAP	2011-07-27 17:53:14 -03:00
ivtv-yuv.c	[media] ivtv: switch to the v4l core lock	2012-01-16 09:59:43 -02:00
ivtv-yuv.h
ivtvfb.c	Driver core: driver_find() drops reference before returning	2012-01-24 16:00:34 -08:00
Kconfig	[media] rc: rename the remaining things to rc_core	2010-12-29 08:16:50 -02:00
Makefile	[media] drivers/media: do not use EXTRA_CFLAGS	2011-09-03 18:50:59 -03:00