Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Gustavo F. Padovan [Thu, 9 Jun 2011 19:33:54 +0000 (16:33 -0300)]
Conflicts:
net/bluetooth/rfcomm/sock.c

1  2 
net/bluetooth/hci_event.c
net/bluetooth/l2cap_sock.c
net/bluetooth/rfcomm/sock.c

Simple merge
Simple merge
@@@ -785,6 -787,9 +786,7 @@@ static int rfcomm_sock_getsockopt_old(s
                        break;
                }
  
 -              l2cap_sk = rfcomm_pi(sk)->dlc->session->sock->sk;
 -
+               memset(&cinfo, 0, sizeof(cinfo));
                cinfo.hci_handle = conn->hcon->handle;
                memcpy(cinfo.dev_class, conn->hcon->dev_class, 3);