Jean Delvare
1349ba02bf
ARM: OMAP: serial: Rename DRIVER_NAME ...
DRIVER_NAME is too generic to be used in a driver-specific platform
data file. Use a name specific to the driver instead, to avoid
collisions.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
Acked-by: Tony Lindgren <tony@atomide.com>
Cc: Jiri Slaby <jslaby@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2016-02-06 23:13:30 -08:00
Merge branches 'acpica', 'acpi-video' and 'acpi-fan'
2016-01-21 00:41:59 +01:00
earlycon: Use common framework for earlycon declarations
2016-02-06 22:07:37 -08:00
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2016-01-22 11:58:43 -08:00
drm/atomic-helper: Export framebuffer_changed()
2016-01-20 08:55:43 +08:00
ARM: SoC driver updates for v4.5
2016-01-20 18:42:30 -08:00
ARM: OMAP: serial: Rename DRIVER_NAME
2016-02-06 23:13:30 -08:00
net: drop tcp_memcontrol.c
2016-01-20 17:09:18 -08:00
IB/mlx4: Enable send of RoCE QP1 packets with IP/UDP headers
2016-01-19 15:35:01 -05:00
Initial roundup of 4.5 merge window patches
2016-01-23 18:45:06 -08:00
ARM: SoC driver updates for v4.5
2016-01-20 18:42:30 -08:00
ALSA: timer: Introduce disconnect op to snd_timer_instance
2016-01-21 17:51:42 +01:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2016-01-20 17:20:53 -08:00
This includes three minor fixes, mostly due to cut-and-paste issues.
2016-01-28 17:00:50 -08:00
drm/etnaviv: add further minor features and varyings count
2016-01-26 18:53:58 +01:00
Merge branch 'for-4.5/drivers' of git://git.kernel.dk/linux-block
2016-01-21 18:19:38 -08:00
1349ba02bf