From: Marcel Holtmann <marcel@holtmann.org>
Date: Tue, 1 Jul 2014 12:11:19 +0000 (+0200)
Subject: Bluetooth: Fix merge of advertising data and scan response data
X-Git-Tag: cleanup-for-v3.18~108^2~73^2~87^2~125
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42bd6a56ed1ab4b2cb50f4d4e674874da9b47f46;p=pandora-kernel.git

Bluetooth: Fix merge of advertising data and scan response data

The advertising data and scan response data are merged in the wrong
order. It should be advertsing data first and then scan response data
and not the other way around.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Cc: stable@vger.kernel.org # 3.16
---

Reading git-diff-tree failed