Revert my mako patches, as it diverges from our branch (and is pointless on a htc kernel btw ..)
Merge AU_LINUX_ANDROID_JB_2.5.04.02.02.040.311 CAF tag.
ion: ioctl compatibility with userland using old api

As far as I can tell, flags passed by userland are now used to determine
buffer caching.

Note in ION_IOC_ALLOC_COMPAT we are currently forcing uncached buffer
allocations (needed to make a choice here).  This
may need to change.

Signed-off-by: Flemmard <flemmard@gmail.com>
Add FLASHLIGHT_TPS61310 led flash driver

Signed-off-by: Flemmard <flemmard@gmail.com>
Add spi_write_and_read function in spi.c

Signed-off-by: Flemmard <flemmard@gmail.com>
Initial commit: Camera working (on ville for now). Took htc drivers/media stack ..
camera: Updated ville boards
camera: add htc_awb_cal
ville: camera: updated defconfig
camera: add elite boards and defconfig (not tested, but should work)
camera: add jet boards and defconfig (not tested, but should work)
Add missing flags for m7 camera
camera: enable building for m7
Revert "bcmdhd_4335 driver (and all hacks needed for it .. probably will need some tweaks but meh .. nothing huge)"

This reverts commit b79e66ea0fe3d9f46e0b952d7d439a187daed1f8.
GPS/Thermald/RIL crash ..
Revert "GPS/Thermald/RIL crash .."

This reverts commit 6c1835da3f1c896e416b7ff30bd2df970657cb44.
Move HTC specific ipc_socket/router onto HTC subfolder, so that caf merges won't mess with that again. ever.
Forgot the ifneq in Makefile for my precedent commit .. sorry