applykernel/ changes from oppo
apply PN544 (NFC) changes from oppo

WARNING:  arch/arm/mach-msm/board-8064.c has a dependency on this

Conflicts:

	drivers/nfc/Kconfig
	drivers/nfc/Makefile
find5 initial release: fs/fat/dir.c changes

Derived from:
git://codeaurora.org/kernel/msm.git
tag A8064AAAAANLYA101034 on branch jb_rel_rb4
find5 initial release: drivers/rtc changes

Derived from:
git://codeaurora.org/kernel/msm.git
tag A8064AAAAANLYA101034 on branch jb_rel_rb4
apply touchscreen changes from oppo

Conflicts:

	drivers/input/touchscreen/Kconfig
	drivers/input/touchscreen/Makefile
apply vidc changes from oppo

Conflicts:

	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_utils.h
apply drivers/misc changes from oppo

Conflicts:

	drivers/misc/Kconfig
	drivers/misc/Makefile
find5 initial release: include/linux/net.h change

I'm not sure this is really needed......

Derived from:
git://codeaurora.org/kernel/msm.git
tag A8064AAAAANLYA101034 on branch jb_rel_rb4
find5 initial release: drivers/tty/vt changes

Derived from:
git://codeaurora.org/kernel/msm.git
tag A8064AAAAANLYA101034 on branch jb_rel_rb4
find5 initial release: drivers/mfd changes

Derived from:
git://codeaurora.org/kernel/msm.git
tag A8064AAAAANLYA101034 on branch jb_rel_rb4
find5 initial release: drivers/hwmon changes

Derived from:
git://codeaurora.org/kernel/msm.git
tag A8064AAAAANLYA101034 on branch jb_rel_rb4
apply drivers/gpio changes from oppo

Conflicts:

	drivers/gpio/gpio-msm-common.c
	drivers/gpio/gpio-msm-v2.c
	drivers/gpio/gpio-msm-v3.c
find5 initial release: arch/arm/traps.c changes

Derived from:
git://codeaurora.org/kernel/msm.git
tag A8064AAAAANLYA101034 on branch jb_rel_rb4
find5 initial release: drivers/base/platform.c changes

Derived from:
git://codeaurora.org/kernel/msm.git
tag A8064AAAAANLYA101034 on branch jb_rel_rb4
Add find5 support to arch/arm/mach-msm

Done by copying board-8064-*.c and manually applying oppo
changes (ref: Sony fusion3 boardfile organization)

Oppo's changes to acpuclock-8064 were not pulled in as
the changes were an upstream cherry-pick from CAF that
is present already in jb_2.5

Also intentionally left out are the acpuclock-krait sysfs changes

Changes to common files were ifdefed with CONFIG_MACH_OPPO_FIND5,
which will replace CONFIG_VENDOR_EDIT as we clean things up.
display changes:  Splashscreen related

Not sure if we need these for jb_2.5 - would be better to not
deal with them.
Forward-port find5 display drivers

LM3528
Orise 1080p panel
MIPI DSI changes to support Orise 1080p panel

Leaving out bootlogo related changes for now.
Add Cyanogenmod defconfig
Forward port media/video (mostly camera) changes
Revert pm8921-core changes - possibly bring back when drivers/power is merged