m7: Linux 3.4.98

** The following commit from upstream wasn't included:

Bluetooth: Fix SSP acceptor just-works confirmation without MITM
(commit ba15a58b179ed76a7e887177f2b06de12c58ec8f upstream.)

Change-Id: I217b44bc8887ec0fc79da6c01b9da180554ef373
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>