Joonyoung Shim
578b6065ad
drm/exynos: fix struct for operation callback functions to driver name ...
The mixer driver and hdmi driver have each operation callback functions
and they is registered to hdmi common driver. Their struct names in hdmi
common driver include display, manager and overlay. It confuses to
appear whose operation and two driver cannot register same operation
callback functions at the same time. Use their struct names to driver
name.
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
2012-04-12 14:51:26 +09:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
1) AHCI regression fix. A recent "make driver conform to spec" change
2012-03-22 20:22:30 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Merge branch 'for-linus-3.4' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf
2012-03-28 15:02:41 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-03-28 17:19:28 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-29 18:12:23 -07:00
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-03-29 16:53:48 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2012-03-22 18:15:32 -07:00
ARM: global cleanups
2012-03-27 16:03:32 -07:00
MTD merge for 3.4
2012-03-30 17:31:56 -07:00
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
2012-03-28 14:24:40 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-03-29 16:53:48 -07:00
drm/exynos: fix struct for operation callback functions to driver name
2012-04-12 14:51:26 +09:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-03-23 14:39:09 -07:00
MFD changes for 3.4
2012-03-28 13:56:35 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
drivers/idle/intel_idle.c: fix confusing code identation
2012-03-21 17:54:54 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-03-29 23:17:44 -07:00
The IOMMU updates for this round are not very large patch-wise. But
2012-03-23 14:15:07 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
MFD changes for 3.4
2012-03-28 13:56:35 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
dm: add verity target
2012-03-28 18:43:38 +01:00
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
MTD merge for 3.4
2012-03-30 17:31:56 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-03-31 13:42:57 -07:00
MTD merge for 3.4
2012-03-30 17:31:56 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
GPIO changes for v3.4
2012-03-28 14:08:46 -07:00
tidy up after d_make_root() conversion
2012-03-20 21:29:37 -04:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
ASPM: Fix pcie devices with non-pcie children
2012-03-31 12:49:56 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
2012-03-29 16:00:48 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
Various small bugfixes and enhancements, plus two new drivers:
2012-03-30 16:09:02 -07:00
ARM: driver specific updates
2012-03-27 16:41:24 -07:00
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
SCSI updates on 20120331
2012-03-31 13:31:23 -07:00
SuperH updates for 3.4 merge window
2012-03-30 00:09:17 -07:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-03-29 15:34:57 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-03-20 21:04:47 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-03-22 12:38:04 -07:00
thermal: Fix for setting the thermal zone mode to enable/disable
2012-03-22 01:10:18 -04:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
uwb: use for_each_clear_bit()
2012-03-23 16:58:34 -07:00
Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2012-03-23 14:46:48 -04:00
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
virtio-pci: switch to PM ops macro to initialise PM functions
2012-03-31 08:09:51 +05:30
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
One tiny feature that accidentally got lost in the initial git pull:
2012-03-24 12:20:25 -07:00
remoteproc/rpmsg: new subsystem
2012-03-27 16:30:09 -07:00
remoteproc/rpmsg: new subsystem
2012-03-27 16:30:09 -07:00
578b6065ad