This repository has been archived on 2026-03-14. You can view files and clone it, but cannot push or open issues or pull requests.

Mohan Pallaka 50b3ed2e2c input: atmel_maxtouch: Rename mxt_platform_data to maxtouch_platform_data ...

Opensource driver atmel_mxt_ts has the platform data
structure name as atmel_maxtouch. Avoid name conflict
by renaming atmel_maxtouch driver's platform data to
maxtouch_platform_data.

Change-Id: I4bf3ed83e3eab55c4464de365c6009965da73744
Signed-off-by: Mohan Pallaka <mpallaka@codeaurora.org>
(cherry picked from commit 4e9a94e60d589581799ac7c3341ec4dfac8793a5)

Conflicts:

	arch/arm/mach-msm/board-msm7x27a.c

2013-02-25 11:40:18 -08:00

..

acpi

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-05-05 10:06:06 -07:00

asm-generic

asm-generic: Use __BITS_PER_LONG in statfs.h

2012-04-30 12:55:15 -07:00

crypto

crypto: user - Fix lookup of algorithms with IV generator

2012-03-29 19:52:47 +08:00

drm

gpu: Add MSM KGSL gpu driver

2013-02-25 11:33:51 -08:00

keys

…

linux

input: atmel_maxtouch: Rename mxt_platform_data to maxtouch_platform_data

2013-02-25 11:40:18 -08:00

math-emu

…

media

media: rc: Add wakeup functionality from GPIO IR event

2013-02-25 11:31:01 -08:00

misc

…

mtd

[ARM] mtd: msm nand driver

2013-02-25 11:31:58 -08:00

net

Bluetooth: Hold wakelock until BT idle timer kicks in.

2013-02-25 11:39:35 -08:00

pcmcia

…

rdma

Merge branches 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iser', 'mad', 'nes', 'qib', 'srp' and 'srpt' into for-next

2012-03-19 09:50:33 -07:00

rxrpc

…

scsi

[SCSI] libsas, libata: fix start of life for a sas ata_port

2012-04-23 12:11:47 +01:00

sound

ALSA: hda - hide HDMI/ELD printks unless snd.debug=2

2012-04-10 14:53:55 +02:00

target

target: Use array_zalloc for device_list

2012-03-15 19:15:51 -07:00

trace

Merge branch 'goog/googly' (early part) into goog/msm-soc-3.4

2013-02-25 11:25:46 -08:00

video

Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm

2012-03-27 18:17:02 -07:00

xen

Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

2012-04-04 17:13:43 -07:00

Kbuild

…