Jyri Sarha 5c348ba96c OMAPDSS: Change struct reg_field to dispc_reg_field ...

Avoid colision with regmap's struct reg_field definition by renaming
omapdss's struct reg_field to dispc_reg_field, and moving it inside
dispc.c as that's the only place it is used.

Signed-off-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

2014-04-14 16:42:49 +03:00

..

accessibility

…

acpi

Merge branch 'acpi-config'

2014-04-08 21:34:51 +02:00

amba

Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:37:40 -07:00

ata

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2014-04-02 16:23:38 -07:00

atm

atm: idt77105: Use del_timer_sync() in exit path

2014-03-25 21:06:02 -04:00

auxdisplay

…

base

Merge tag 'regmap-v3.15-nodev' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

2014-04-11 13:25:08 -07:00

bcma

bcma: gpio: register 32 GPIOs on BCM5357

2014-03-27 14:20:04 -04:00

block

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2014-04-12 14:49:50 -07:00

bluetooth

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2014-04-02 20:53:45 -07:00

bus

Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:37:40 -07:00

cdrom

…

char

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2014-04-12 14:49:50 -07:00

clk

Merge tag 'mfd-for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

2014-04-07 10:24:18 -07:00

clocksource

Merge tag 'cpu-hotplug-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2014-04-07 14:55:46 -07:00

connector

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2014-04-02 20:53:45 -07:00

cpufreq

Merge branch 'pm-cpufreq'

2014-04-08 13:28:02 +02:00

cpuidle

Merge branch 'pm-cpuidle'

2014-04-08 13:27:40 +02:00

crypto

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2014-04-03 09:28:16 -07:00

dca

…

devfreq

PM / devfreq: Rewrite devfreq_update_status() to fix multiple bugs

2014-03-21 11:16:30 +09:00

dio

…

dma

Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

2014-04-10 08:55:08 -07:00

edac

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2014-04-04 09:50:07 -07:00

eisa

…

extcon

extcon: Move OF helper function to extcon core and change function name

2014-03-19 14:41:58 +09:00

firewire

…

firmware

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-04-11 11:58:33 -07:00

fmc

…

gpio

Merge tag 'mfd-for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

2014-04-07 10:24:18 -07:00

gpu

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

2014-04-08 09:52:16 -07:00

hid

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2014-04-04 09:50:07 -07:00

hsi

…

hv

Merge tag 'char-misc-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2014-04-01 16:13:21 -07:00

hwmon

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2014-04-09 08:35:31 -07:00

hwspinlock

…

i2c

Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

2014-04-09 08:45:40 -07:00

ide

…

idle

Merge branch 'pm-cpuidle'

2014-04-08 13:27:40 +02:00

iio

Merge tag 'mfd-for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

2014-04-07 10:24:18 -07:00

infiniband

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2014-04-12 16:51:08 -07:00

input

Merge tag 'pwm/for-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

2014-04-05 18:32:31 -07:00

iommu

Merge tag 'iommu-updates-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

2014-04-05 18:46:26 -07:00

ipack

…

irqchip

Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:37:40 -07:00

isdn

isdnloop: several buffer overflows

2014-04-08 12:41:13 -04:00

leds

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds

2014-04-10 09:06:10 -07:00

lguest

drivers/lguest/page_tables.c: rename do_set_pte()

2014-04-07 16:35:52 -07:00

macintosh

…

mailbox

…

mcb

…

md

Merge tag 'md/3.15' of git://neil.brown.name/md

2014-04-11 17:20:38 -07:00

media

[media] gpsca: remove the risk of a division by zero

2014-04-08 11:01:12 -03:00

memory

…

memstick

…

message

Merge tag 'pci-v3.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2014-04-01 15:14:04 -07:00

mfd

Merge tag 'mmc-updates-for-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

2014-04-09 08:39:39 -07:00

misc

drivers/misc/sgi-gru/grukdump.c: cleanup gru_dump_context() a little

2014-04-07 16:36:09 -07:00

mmc

Merge tag 'mmc-updates-for-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

2014-04-09 08:39:39 -07:00

mtd

Merge tag 'for-linus-20140405' of git://git.infradead.org/linux-mtd

2014-04-07 10:17:30 -07:00

net

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-04-12 17:31:22 -07:00

nfc

…

ntb

ntb: Use pci_enable_msix_range() instead of pci_enable_msix()

2014-04-07 10:59:20 -07:00

nubus

…

of

Merge tag 'for-linus-20140405' of git://git.infradead.org/linux-mtd

2014-04-07 10:17:30 -07:00

oprofile

oprofile, nmi-timer: Fix CPU hotplug callback registration

2014-03-20 13:43:46 +01:00

parisc

…

parport

…

pci

Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2014-04-06 09:38:07 -07:00

pcmcia

Merge tag 'pci-v3.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2014-04-01 15:14:04 -07:00

phy

Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:37:40 -07:00

pinctrl

Merge tag 'gpio-v3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio

2014-04-03 16:44:15 -07:00

platform

alienware-wmi: cover some scenarios where memory allocations would fail

2014-04-10 12:11:56 -04:00

pnp

Merge tag 'pm+acpi-3.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2014-04-02 14:10:21 -07:00

power

Merge tag 'mvebu-drivers-3.15-2' of git://git.infradead.org/linux-mvebu into next/drivers

2014-03-17 11:14:34 +01:00

powercap

Merge tag 'cpu-hotplug-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2014-04-07 14:55:46 -07:00

pps

…

ps3

…

ptp

net: ptp: move PTP classifier in its own file

2014-04-01 16:43:18 -04:00

pwm

Merge tag 'pwm/for-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

2014-04-05 18:32:31 -07:00

rapidio

rapidio: rework device hierarchy and introduce mport class of devices

2014-04-07 16:36:07 -07:00

regulator

Merge tag 'regulator-v3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

2014-04-11 13:30:05 -07:00

remoteproc

…

reset

Merge branch 'reset/for_v3.15' of git://git.pengutronix.de/git/pza/linux into next/drivers

2014-03-27 01:28:19 +01:00

rpmsg

…

rtc

Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:37:40 -07:00

s390

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2014-04-08 12:02:28 -07:00

sbus

…

scsi

sym53c8xx_2: Set DID_REQUEUE return code when aborting squeue

2014-04-12 18:02:16 -07:00

sfi

…

sh

Merge tag 'sh-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-04-05 15:38:41 -07:00

sn

…

spi

Merge tag 'spi-v3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

2014-04-11 13:35:49 -07:00

spmi

…

ssb

…

staging

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-04-12 17:31:22 -07:00

target

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-04-12 17:31:22 -07:00

tc

…

thermal

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

2014-04-10 09:15:46 -07:00

tty

Merge git://git.infradead.org/users/eparis/audit

2014-04-12 12:38:53 -07:00

uio

…

usb

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2014-04-12 16:51:08 -07:00

uwb

…

vfio

Merge tag 'vfio-v3.15-rc1' of git://github.com/awilliam/linux-vfio

2014-04-03 14:05:02 -07:00

vhost

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2014-04-12 16:51:08 -07:00

video

OMAPDSS: Change struct reg_field to dispc_reg_field

2014-04-14 16:42:49 +03:00

virt

…

virtio

…

vlynq

…

vme

…

w1

…

watchdog

Merge tag 'cpu-hotplug-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2014-04-07 14:55:46 -07:00

xen

Merge tag 'stable/for-linus-3.15-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2014-04-07 17:50:18 -07:00

zorro

…

Kconfig

…

Makefile

…