Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6

Conflicts:
	net/bluetooth/rfcomm/sock.c

diff --cc net/bluetooth/hci_event.c
Simple merge

diff --cc net/bluetooth/l2cap_sock.c
Simple merge

diff --cc net/bluetooth/rfcomm/sock.c
index bcf077c,5dea4d8..8f01e6b
--- 1/net/bluetooth/rfcomm/sock.c
--- 2/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@@ -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);