Christophe Ricard 76b733d158 nfc: st-nci: Remove duplicate file platform_data/st_nci.h ... commit "nfc: st-nci: Rename st21nfcb to st-nci" adds include/linux/platform_data/st_nci.h duplicated with include/linux/platform_data/st-nci.h. Only drivers/nfc/st-nci/i2c.c uses platform_data/st_nci.h. Cc: stable@vger.kernel.org Reported-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>		2015-08-17 00:35:06 +02:00
..
acpi	Additional ACPICA material for v4.2-rc1	2015-07-02 17:11:28 -07:00
asm-generic	mm: clean up per architecture MM hook header files	2015-07-17 16:39:53 -07:00
clocksource
crypto
drm	drm/radeon: add new OLAND pci id	2015-08-12 12:24:05 -04:00
dt-bindings	The changes to the common clock framework for 4.2 are dominated by new	2015-07-01 19:22:00 -07:00
keys
kvm
linux	nfc: st-nci: Remove duplicate file platform_data/st_nci.h	2015-08-17 00:35:06 +02:00
math-emu
media	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds	2015-07-01 19:09:11 -07:00
memory
misc
net	net: Fix up inet_addr_type checks	2015-08-13 22:43:21 -07:00
pcmcia
ras	tracing: add trace event for memory-failure	2015-06-24 17:49:43 -07:00
rdma	IB: Add rdma_cap_ib_switch helper and use where appropriate	2015-07-14 13:20:08 -04:00
rxrpc
scsi	IB/srp: Avoid using uninitialized variable	2015-07-14 13:20:09 -04:00
soc	Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-06-26 12:20:00 -07:00
sound
target	iscsi-target: Fix iscsit_start_kthreads failure OOPs	2015-07-24 14:19:43 -07:00
trace	Merge branch 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2015-06-30 20:07:45 -07:00
uapi	net: Introduce VRF related flags and helpers	2015-08-13 22:43:20 -07:00
video	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2015-06-26 13:18:51 -07:00
xen
Kbuild