d2: update bluetooth to latest d2 source drop (i535's ML1)

board-bluetooth-bcm4334's change is arbitrary, but w/e

Change-Id: I48a57b0070148db7946a264fb485850b95cf4944
bcmdhd: filter multicast during sleep

Change-Id: I0e56dbd579c44157fb26c34c1de078b62cbe07ec
d2: use sprint final board revision to fix up sensor

Change-Id: I4f2063ad5296297a945976ca011823c2a0487129
Merge "bcmdhd: filter multicast during sleep" into cm-11.0
Merge "d2: update bluetooth to latest d2 source drop (i535's ML1)" into cm-11.0
Merge remote-tracking branch 'caf/kk_2.7_rb1.21' into cm-11.0

Conflicts:
	net/wireless/reg.c

Change-Id: Ie543e81d9d67af8695a18212fecb95f12f3595e7
Do not reset bam hardware when A2 goes into pc on ApexQ

Prevent bootloops

This removes the functional component of
a82a95c209207c4f7721971785863e90603b93f2

Change-Id: I1b9038be3932db2bc8e0c46d7e5431ef40b7b01f
Merge "d2: use sprint final board revision to fix up sensor" into cm-11.0
Prima 3.2.7.24
msm: mpdecision: update dcvs algo params at initialization

By skipping the update of dcvs algo params when mpdecision first
starts, there's a small window where dcvs may run with the incorrect
parameters, depending on how many CPUs are online.

Change-Id: I44094a9abb5e801b0869fb8b796a62eb4d0c49be
Signed-off-by: Steve Muckle <smuckle@codeaurora.org>
Revert "Revert "msm: msm_fb: Do not use ION_IOMMU_UNMAP_DELAYED flag.""

This reverts commit 56da8a18ea81a8d7a6d26395bd03475ada93289a.
Re-enable earlysuspend for MDP driver
nf: xt_qtaguid: fix handling for cases where tunnels are used.

* fix skb->dev vs par->in/out
When there is some forwarding going on, it introduces extra state
around devs associated with xt_action_param->in/out and sk_buff->dev.
E.g.
   par->in and par->out are both set, or
   skb->dev and par->out are both set (and different)
This would lead qtaguid to make the wrong assumption about the
direction and update the wrong device stats.
Now we rely more on par->in/out.

* Fix handling when qtaguid is used as "owner"
When qtaguid is used as an owner module, and sk_socket->file is
not there (happens when tunnels are involved), it would
incorrectly do a tag stats update.

* Correct debug messages.

Bug: 11687690
Change-Id: I2b1ff8bd7131969ce9e25f8291d83a6280b3ba7f
Signed-off-by: JP Abgrall <jpa@google.com>
Revert "ApexQ: cap at 1458 MHZ"

This reverts commit 9dc153678a37ec757c11fa8bfea463bbb45ab351.
exFAT: Update to v1.2.5

Change-Id: I6a43a674e5edc599b00a902247539b11569f4e6f
apexq: enable CONFIG_NETFILTER_XT_TARGET_TCPMSS

Change-Id: I9729d002a8c326f8e8ae3a1a6c43547c884d265f
timerfd: add alarm timers

Add support for clocks CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM.

Change-Id: Iafc8445d3d7ffb35110c860f1607bf03f1edb895
Signed-off-by: Todd Poynor <toddpoynor@google.com>
timerfd: support CLOCK_BOOTTIME clock

Add CLOCK_BOOTTIME support to timerfd

Change-Id: I14dee6d1104f15a05f463a632268ac4564753faf
Signed-off-by: Greg Hackmann <ghackmann@google.com>
alarmtimer: Use hrtimer per-alarm instead of per-base

Arve Hjønnevåg reported numerous crashes from the
"BUG_ON(timer->state != HRTIMER_STATE_CALLBACK)" check
in __run_hrtimer after it called alarmtimer_fired.

It ends up the alarmtimer code was not properly handling
possible failures of hrtimer_try_to_cancel, and because
these faulres occur when the underlying base hrtimer is
being run, this limits the ability to properly handle
modifications to any alarmtimers on that base.

Because much of the logic duplicates the hrtimer logic,
it seems that we might as well have a per-alarmtimer
hrtimer, and avoid the extra complextity of trying to
multiplex many alarmtimers off of one hrtimer.

Thus this patch moves the hrtimer to the alarm structure
and simplifies the management logic.

Change-Id: I54b2d718ed1d39598e321eacf88c3335284d4cea
Cc: Arve Hjønnevåg <arve@android.com>
Cc: Colin Cross <ccross@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Reported-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
alarmtimer: add alarm_restart

Analogous to hrtimer_restart, restart an alarmtimer after the expires
time has already been updated (as with alarm_forward).

Change-Id: Ia2613bbb467404cb2c35c11efa772bc56294963a
Signed-off-by: Todd Poynor <toddpoynor@google.com>