From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 19 Oct 2012 19:22:27 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth... 
X-Git-Tag: v3.8-rc1~139^2~17^2~353
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc27d5f14363a1065bf9437a5bca5409492b6c06;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'master' of git://git./linux/kernel/git/bluetooth/bluetooth-next
---

bc27d5f14363a1065bf9437a5bca5409492b6c06
diff --cc net/bluetooth/af_bluetooth.c
index ba033f0,a9ad589..5355df6
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@@ -591,10 -589,10 +589,10 @@@ static int bt_seq_show(struct seq_file 
  			   atomic_read(&sk->sk_refcnt),
  			   sk_rmem_alloc_get(sk),
  			   sk_wmem_alloc_get(sk),
 -			   sock_i_uid(sk),
 +			   from_kuid(seq_user_ns(seq), sock_i_uid(sk)),
  			   sock_i_ino(sk),
- 			   &src_baswapped,
- 			   &dst_baswapped,
+ 			   &bt->src,
+ 			   &bt->dst,
  			   bt->parent? sock_i_ino(bt->parent): 0LU);
  
  		if (l->custom_seq_show) {