Lv Zheng 78e25fef27 ACPICA: Fix divergences of definition conflicts. ... There are conflicts in the "acpi_device_id*" definitions between the Linux and the ACPICA. The definitions of acpi_device_id* in ACPICA have been changed to the "acpi_pnp_device_id*". This patch changes the corresponding "acpica_device_id*" definitiions in the Linux. This patch will not affect the generated vmlinx binary. This will decrease 298 lines of 20120913 divergence.diff. Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>		2012-11-15 00:31:22 +01:00
..
acpi	ACPICA: Fix divergences of definition conflicts.	2012-11-15 00:31:22 +01:00
asm-generic	UAPI: Remove empty non-UAPI Kbuild files	2012-10-17 12:31:15 +01:00
clocksource	arm64: Generic timers support	2012-09-17 13:42:20 +01:00
crypto	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
drm	drm/radeon: add some new SI PCI ids	2012-10-23 10:23:49 -04:00
keys	KEYS: Asymmetric key pluggable data parsers	2012-10-08 13:50:13 +10:30
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 22:03:49 +01:00
math-emu
media	Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung into drm-next	2012-10-07 21:06:33 +10:00
memory
misc
net	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211	2012-10-29 14:14:48 -04:00
pcmcia
ras
rdma	infiniband: pass rdma_cm module to netlink_dump_start	2012-10-07 00:30:56 -04:00
rxrpc
scsi	SCSI misc on 20121012	2012-10-13 10:57:01 +09:00
sound	ALSA: Add a reference counter to card instance	2012-10-30 11:07:10 +01:00
target	target: Add target_submit_cmd_map_sgls for SGL fabric memory passthrough	2012-10-02 14:16:08 -07:00
trace	xen/mmu: Use Xen specific TLB flush instead of the generic one.	2012-10-31 12:38:31 -04:00
uapi	revert "epoll: support for disabling items, and a self-test app"	2012-11-09 06:41:46 +01:00
video	fbdev updates for 3.7	2012-10-12 10:21:02 +09:00
xen	Bug-fixes:	2012-11-10 06:56:21 +01:00
Kbuild	UAPI: Remove empty non-UAPI Kbuild files	2012-10-17 12:31:15 +01:00