net: bluetooth: fix bad merge
authorVarun Wadekar <vwadekar@nvidia.com>
Fri, 6 Apr 2012 21:00:30 +0000 (02:00 +0530)
committerVarun Wadekar <vwadekar@nvidia.com>
Fri, 6 Apr 2012 21:00:30 +0000 (02:00 +0530)
commit39287304ba5359b6e1ab4bb0265f18b6a6d7bcbf
treefb0e3f1205c11ae7a2c3894acac69ac5d1359bbd
parent278273d4d69f959090c65cbd32d9739aad21e199
net: bluetooth: fix bad merge

Change-Id: Iccd6dc23522057bae039600ce72017fccbf7febe
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
net/bluetooth/mgmt.c
net/bluetooth/smp.c