Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...

diff --combined MAINTAINERS
index 6d05ae23603679310ba6f0a685e0308c1148d47a,6555183d7cf578e610ad96b547f7bfd5be8d8fa9..6010b9d13b477fff1df776e7ee1f6a62e731529f
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -163,7 -163,7 +163,7 @@@ M: Greg Kroah-Hartman <gregkh@linuxfoun
  L:    linux-serial@vger.kernel.org
  W:    http://serial.sourceforge.net
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
  F:    drivers/tty/serial/8250*
  F:    include/linux/serial_8250.h
  
@@@ -464,7 -464,6 +464,7 @@@ ALPHA POR
  M:    Richard Henderson <rth@twiddle.net>
  M:    Ivan Kokshaysky <ink@jurassic.park.msu.ru>
  M:    Matt Turner <mattst88@gmail.com>
 +S:    Odd Fixes
  L:    linux-alpha@vger.kernel.org
  F:    arch/alpha/
  
@@@ -504,7 -503,7 +504,7 @@@ F: arch/x86/include/asm/geode.
  AMD IOMMU (AMD-VI)
  M:    Joerg Roedel <joerg.roedel@amd.com>
  L:    iommu@lists.linux-foundation.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
  S:    Supported
  F:    drivers/iommu/amd_iommu*.[ch]
  F:    include/linux/amd-iommu.h
@@@ -716,7 -715,6 +716,7 @@@ S: Maintaine
  ARM/CLKDEV SUPPORT
  M:    Russell King <linux@arm.linux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
  F:    arch/arm/include/asm/clkdev.h
  F:    drivers/clk/clkdev.c
  
@@@ -786,6 -784,7 +786,6 @@@ M: Sascha Hauer <kernel@pengutronix.de
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.pengutronix.de/git/imx/linux-2.6.git
 -F:    arch/arm/mach-mx*/
  F:    arch/arm/mach-imx/
  F:    arch/arm/plat-mxc/
  
@@@ -815,12 -814,9 +815,12 @@@ S:       Maintaine
  
  ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT
  M:    Philipp Zabel <philipp.zabel@gmail.com>
 +M:    Paul Parsons <lost.distance@yahoo.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-pxa/hx4700.c
  F:    arch/arm/mach-pxa/include/mach/hx4700.h
 +F:    sound/soc/pxa/hx4700.c
  
  ARM/HP JORNADA 7XX MACHINE SUPPORT
  M:    Kristoffer Ericson <kristoffer.ericson@gmail.com>
@@@ -1505,7 -1501,7 +1505,7 @@@ F:      drivers/i2c/busses/i2c-bfin-twi.
  
  BLOCK LAYER
  M:    Jens Axboe <axboe@kernel.dk>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  S:    Maintained
  F:    block/
  
@@@ -1521,8 -1517,8 +1521,8 @@@ M:      Gustavo Padovan <gustavo@padovan.org
  M:    Johan Hedberg <johan.hedberg@gmail.com>
  L:    linux-bluetooth@vger.kernel.org
  W:    http://www.bluez.org/
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth.git
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jh/bluetooth.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
  S:    Maintained
  F:    drivers/bluetooth/
  
@@@ -1532,8 -1528,8 +1532,8 @@@ M:      Gustavo Padovan <gustavo@padovan.org
  M:    Johan Hedberg <johan.hedberg@gmail.com>
  L:    linux-bluetooth@vger.kernel.org
  W:    http://www.bluez.org/
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth.git
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jh/bluetooth.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
  S:    Maintained
  F:    net/bluetooth/
  F:    include/net/bluetooth/
@@@ -1643,7 -1639,7 +1643,7 @@@ BTTV VIDEO4LINUX DRIVE
  M:    Mauro Carvalho Chehab <mchehab@infradead.org>
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    Documentation/video4linux/bttv/
  F:    drivers/media/video/bt8xx/bttv*
@@@ -1673,7 -1669,7 +1673,7 @@@ F:      fs/cachefiles
  CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
  M:    Jonathan Corbet <corbet@lwn.net>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    Documentation/video4linux/cafe_ccic
  F:    drivers/media/video/marvell-ccic/
@@@ -1835,16 -1831,8 +1835,16 @@@ L:    alsa-devel@alsa-project.org (moderat
  S:    Supported
  F:    sound/soc/codecs/cs4270*
  
 +CLEANCACHE API
 +M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    mm/cleancache.c
 +F:    include/linux/cleancache.h
 +
  CLK API
  M:    Russell King <linux@arm.linux.org.uk>
 +S:    Maintained
  F:    include/linux/clk.h
  
  CISCO FCOE HBA DRIVER
@@@ -1939,7 -1927,7 +1939,7 @@@ F:      drivers/connector
  
  CONTROL GROUPS (CGROUPS)
  M:    Tejun Heo <tj@kernel.org>
 -M:    Li Zefan <lizf@cn.fujitsu.com>
 +M:    Li Zefan <lizefan@huawei.com>
  L:    containers@lists.linux-foundation.org
  L:    cgroups@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
@@@ -2040,7 -2028,7 +2040,7 @@@ CX18 VIDEO4LINUX DRIVE
  M:    Andy Walls <awalls@md.metrocast.net>
  L:    ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://linuxtv.org
  W:    http://www.ivtvdriver.org/index.php/Cx18
  S:    Maintained
@@@ -2113,13 -2101,6 +2113,13 @@@ W:    http://www.cyclades.com
  S:    Orphan
  F:    drivers/net/wan/pc300*
  
 +CYTTSP TOUCHSCREEN DRIVER
 +M:      Javier Martinez Canillas <javier@dowhile0.org>
 +L:      linux-input@vger.kernel.org
 +S:      Maintained
 +F:      drivers/input/touchscreen/cyttsp*
 +F:      include/linux/input/cyttsp.h
 +
  DAMA SLAVE for AX.25
  M:    Joerg Reuter <jreuter@yaina.de>
  W:    http://yaina.de/jreuter/
@@@ -2224,16 -2205,13 +2224,16 @@@ W:   http://lanana.org/docs/device-list/i
  S:    Maintained
  
  DEVICE-MAPPER  (LVM)
 -P:    Alasdair Kergon
 +M:    Alasdair Kergon <agk@redhat.com>
 +M:    dm-devel@redhat.com
  L:    dm-devel@redhat.com
  W:    http://sources.redhat.com/dm
  Q:    http://patchwork.kernel.org/project/dm-devel/list/
 +T:    quilt http://people.redhat.com/agk/patches/linux/editing/
  S:    Maintained
  F:    Documentation/device-mapper/
  F:    drivers/md/dm*
 +F:    drivers/md/persistent-data/
  F:    include/linux/device-mapper.h
  F:    include/linux/dm-*.h
  
@@@ -2264,15 -2242,6 +2264,15 @@@ F:    Documentation/filesystems/quota.tx
  F:    fs/quota/
  F:    include/linux/quota*.h
  
 +DISPLAYLINK USB 2.0 FRAMEBUFFER DRIVER (UDLFB)
 +M:    Bernie Thompson <bernie@plugable.com>
 +L:    linux-fbdev@vger.kernel.org
 +S:    Maintained
 +W:    http://plugable.com/category/projects/udlfb/
 +F:    drivers/video/udlfb.c
 +F:    include/video/udlfb.h
 +F:    Documentation/fb/udlfb.txt
 +
  DISTRIBUTED LOCK MANAGER (DLM)
  M:    Christine Caulfield <ccaulfie@redhat.com>
  M:    David Teigland <teigland@redhat.com>
@@@ -2357,7 -2326,7 +2357,7 @@@ F:      Documentation/blockdev/drbd
  
  DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
  S:    Supported
  F:    Documentation/kobject.txt
  F:    drivers/base/
@@@ -2379,7 -2348,7 +2379,7 @@@ INTEL DRM DRIVERS (excluding Poulsbo, M
  M:    Keith Packard <keithp@keithp.com>
  L:    intel-gfx@lists.freedesktop.org (subscribers-only)
  L:    dri-devel@lists.freedesktop.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux.git
  S:    Supported
  F:    drivers/gpu/drm/i915
  F:    include/drm/i915*
@@@ -2394,6 -2363,15 +2394,6 @@@ S:     Supporte
  F:    drivers/gpu/drm/exynos
  F:    include/drm/exynos*
  
 -EXYNOS MIPI DISPLAY DRIVERS
 -M:    Inki Dae <inki.dae@samsung.com>
 -M:    Donghwa Lee <dh09.lee@samsung.com>
 -M:    Kyungmin Park <kyungmin.park@samsung.com>
 -L:    linux-fbdev@vger.kernel.org
 -S:    Maintained
 -F:    drivers/video/exynos/exynos_mipi*
 -F:    include/video/exynos_mipi*
 -
  DSCC4 DRIVER
  M:    Francois Romieu <romieu@fr.zoreil.com>
  L:    netdev@vger.kernel.org
@@@ -2674,21 -2652,6 +2674,21 @@@ M:    Mimi Zohar <zohar@us.ibm.com
  S:    Supported
  F:    security/integrity/evm/
  
 +EXYNOS DP DRIVER
 +M:    Jingoo Han <jg1.han@samsung.com>
 +L:    linux-fbdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/video/exynos/exynos_dp*
 +
 +EXYNOS MIPI DISPLAY DRIVERS
 +M:    Inki Dae <inki.dae@samsung.com>
 +M:    Donghwa Lee <dh09.lee@samsung.com>
 +M:    Kyungmin Park <kyungmin.park@samsung.com>
 +L:    linux-fbdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/video/exynos/exynos_mipi*
 +F:    include/video/exynos_mipi*
 +
  F71805F HARDWARE MONITORING DRIVER
  M:    Jean Delvare <khali@linux-fr.org>
  L:    lm-sensors@lm-sensors.org
@@@ -2973,8 -2936,8 +2973,8 @@@ GFS2 FILE SYSTE
  M:    Steven Whitehouse <swhiteho@redhat.com>
  L:    cluster-devel@redhat.com
  W:    http://sources.redhat.com/cluster/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git
  S:    Supported
  F:    Documentation/filesystems/gfs2*.txt
  F:    fs/gfs2/
@@@ -3015,42 -2978,42 +3015,42 @@@ F:   drivers/net/ethernet/aeroflex
  GSPCA FINEPIX SUBDRIVER
  M:    Frank Zago <frank@zago.net>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/finepix.c
  
  GSPCA GL860 SUBDRIVER
  M:    Olivier Lorin <o.lorin@laposte.net>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/gl860/
  
  GSPCA M5602 SUBDRIVER
  M:    Erik Andren <erik.andren@gmail.com>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/m5602/
  
  GSPCA PAC207 SONIXB SUBDRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/pac207.c
  
  GSPCA SN9C20X SUBDRIVER
  M:    Brian Johnson <brijohn@gmail.com>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/sn9c20x.c
  
  GSPCA T613 SUBDRIVER
  M:    Leandro Costantino <lcostantino@gmail.com>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/t613.c
  
@@@ -3058,7 -3021,7 +3058,7 @@@ GSPCA USB WEBCAM DRIVE
  M:    Jean-Francois Moine <moinejf@free.fr>
  W:    http://moinejf.free.fr
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/
  
@@@ -3344,7 -3307,7 +3344,7 @@@ IDE SUBSYSTE
  M:    "David S. Miller" <davem@davemloft.net>
  L:    linux-ide@vger.kernel.org
  Q:    http://patchwork.ozlabs.org/project/linux-ide/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git
  S:    Maintained
  F:    Documentation/ide/
  F:    drivers/ide/
@@@ -3456,7 -3419,7 +3456,7 @@@ F:      firmware/isci
  INTEL IDLE DRIVER
  M:    Len Brown <lenb@kernel.org>
  L:    linux-pm@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git
  S:    Supported
  F:    drivers/idle/intel_idle.c
  
@@@ -3556,13 -3519,17 +3556,13 @@@ L:   linux-pm@vger.kernel.or
  S:    Supported
  F:    arch/x86/platform/mrst/pmu.*
  
 -INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
 +INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
 +M:    Stanislav Yakovlev <stas.yakovlev@gmail.com>
  L:    linux-wireless@vger.kernel.org
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/networking/README.ipw2100
 -F:    drivers/net/wireless/ipw2x00/ipw2100.*
 -
 -INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
 -L:    linux-wireless@vger.kernel.org
 -S:    Orphan
  F:    Documentation/networking/README.ipw2200
 -F:    drivers/net/wireless/ipw2x00/ipw2200.*
 +F:    drivers/net/wireless/ipw2x00/
  
  INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
  M:    Joseph Cihula <joseph.cihula@intel.com>
@@@ -3759,7 -3726,7 +3759,7 @@@ IVTV VIDEO4LINUX DRIVE
  M:    Andy Walls <awalls@md.metrocast.net>
  L:    ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.ivtvdriver.org
  S:    Maintained
  F:    Documentation/video4linux/*.ivtv
@@@ -3855,8 -3822,8 +3855,8 @@@ F:      fs/autofs4
  
  KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
  M:    Michal Marek <mmarek@suse.cz>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git for-next
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git rc-fixes
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git for-next
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git rc-fixes
  L:    linux-kbuild@vger.kernel.org
  S:    Maintained
  F:    Documentation/kbuild/
@@@ -4103,7 -4070,7 +4103,7 @@@ M:      Josh Boyer <jwboyer@gmail.com
  M:    Matt Porter <mporter@kernel.crashing.org>
  W:    http://www.penguinppc.org/
  L:    linuxppc-dev@lists.ozlabs.org
 -T:    git git://git.infradead.org/users/jwboyer/powerpc-4xx.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git
  S:    Maintained
  F:    arch/powerpc/platforms/40x/
  F:    arch/powerpc/platforms/44x/
@@@ -4236,14 -4203,12 +4236,14 @@@ F:   Documentation/hwmon/ltc426
  F:    drivers/hwmon/ltc4261.c
  
  LTP (Linux Test Project)
 -M:    Rishikesh K Rajak <risrajak@linux.vnet.ibm.com>
 -M:    Garrett Cooper <yanegomi@gmail.com>
 +M:    Shubham Goyal <shubham@linux.vnet.ibm.com>
  M:    Mike Frysinger <vapier@gentoo.org>
 -M:    Subrata Modak <subrata@linux.vnet.ibm.com>
 +M:    Cyril Hrubis <chrubis@suse.cz>
 +M:    Caspar Zhang <caspar@casparzhang.com>
 +M:    Wanlong Gao <gaowanlong@cn.fujitsu.com>
  L:    ltp-list@lists.sourceforge.net (subscribers-only)
  W:    http://ltp.sourceforge.net/
 +T:    git git://github.com/linux-test-project/ltp.git
  T:    git git://ltp.git.sourceforge.net/gitroot/ltp/ltp-dev
  S:    Maintained
  
@@@ -4281,7 -4246,7 +4281,7 @@@ MAC8021
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linux-wireless@vger.kernel.org
  W:    http://linuxwireless.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
  S:    Maintained
  F:    Documentation/networking/mac80211-injection.txt
  F:    include/net/mac80211.h
@@@ -4292,7 -4257,7 +4292,7 @@@ M:      Stefano Brivio <stefano.brivio@polim
  M:    Mattias Nissler <mattias.nissler@gmx.de>
  L:    linux-wireless@vger.kernel.org
  W:    http://linuxwireless.org/en/developers/Documentation/mac80211/RateControl/PID
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
  S:    Maintained
  F:    net/mac80211/rc80211_pid*
  
@@@ -4309,13 -4274,6 +4309,13 @@@ W:    http://www.kernel.org/doc/man-page
  L:    linux-man@vger.kernel.org
  S:    Maintained
  
 +MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)
 +M:    Mirko Lindner <mlindner@marvell.com>
 +M:    Stephen Hemminger <shemminger@vyatta.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ethernet/marvell/sk*
 +
  MARVELL LIBERTAS WIRELESS DRIVER
  M:    Dan Williams <dcbw@redhat.com>
  L:    libertas-dev@lists.infradead.org
@@@ -4346,6 -4304,12 +4346,6 @@@ M:     Nicolas Pitre <nico@fluxnic.net
  S:    Odd Fixes
  F:    drivers/mmc/host/mvsdio.*
  
 -MARVELL YUKON / SYSKONNECT DRIVER
 -M:    Mirko Lindner <mlindner@syskonnect.de>
 -M:    Ralph Roesler <rroesler@syskonnect.de>
 -W:    http://www.syskonnect.com
 -S:    Supported
 -
  MATROX FRAMEBUFFER DRIVER
  L:    linux-fbdev@vger.kernel.org
  S:    Orphan
@@@ -4365,7 -4329,7 +4365,7 @@@ P:      LinuxTV.org Projec
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org
  Q:    http://patchwork.kernel.org/project/linux-media/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    Documentation/dvb/
  F:    Documentation/video4linux/
@@@ -4422,13 -4386,6 +4422,13 @@@ T:    git git://git.monstr.eu/linux-2.6-mi
  S:    Supported
  F:    arch/microblaze/
  
 +MICROCHANNEL ARCHITECTURE (MCA)
 +M:    James Bottomley <James.Bottomley@HansenPartnership.com>
 +S:    Maintained
 +F:    Documentation/mca.txt
 +F:    drivers/mca/
 +F:    include/linux/mca*
 +
  MICROTEK X6 SCANNER
  M:    Oliver Neukum <oliver@neukum.name>
  S:    Maintained
@@@ -4444,6 -4401,14 +4444,6 @@@ S:     Supporte
  F:    Documentation/mips/
  F:    arch/mips/
  
 -MISCELLANEOUS MCA-SUPPORT
 -M:    James Bottomley <James.Bottomley@HansenPartnership.com>
 -S:    Maintained
 -F:    Documentation/ia64/mca.txt
 -F:    Documentation/mca.txt
 -F:    drivers/mca/
 -F:    include/linux/mca*
 -
  MODULE SUPPORT
  M:    Rusty Russell <rusty@rustcorp.com.au>
  S:    Maintained
@@@ -4651,7 -4616,7 +4651,7 @@@ M:      James Morris <jmorris@namei.org
  M:    Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
  M:    Patrick McHardy <kaber@trash.net>
  L:    netdev@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
  S:    Maintained
  F:    net/ipv4/
  F:    net/ipv6/
@@@ -4667,7 -4632,7 +4667,7 @@@ NETWORKING [WIRELESS
  M:    "John W. Linville" <linville@tuxdriver.com>
  L:    linux-wireless@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-wireless/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
  S:    Maintained
  F:    net/mac80211/
  F:    net/rfkill/
@@@ -4680,8 -4645,8 +4680,8 @@@ F:      drivers/net/wireless
  NETWORKING DRIVERS
  L:    netdev@vger.kernel.org
  W:    http://www.linuxfoundation.org/en/Net
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
  S:    Odd Fixes
  F:    drivers/net/
  F:    include/linux/if_*
@@@ -4897,7 -4862,7 +4897,7 @@@ F:      drivers/char/pcmcia/cm4040_cs.
  OMNIVISION OV7670 SENSOR DRIVER
  M:    Jonathan Corbet <corbet@lwn.net>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/ov7670.c
  
@@@ -5072,7 -5037,7 +5072,7 @@@ M:      Helge Deller <deller@gmx.de
  L:    linux-parisc@vger.kernel.org
  W:    http://www.parisc-linux.org/
  Q:    http://patchwork.kernel.org/project/linux-parisc/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git
  S:    Maintained
  F:    arch/parisc/
  F:    drivers/parisc/
@@@ -5125,17 -5090,17 +5125,17 @@@ F:   Documentation/PCI/pci-error-recovery
  F:    Documentation/powerpc/eeh-pci-error-recovery.txt
  
  PCI SUBSYSTEM
 -M:    Jesse Barnes <jbarnes@virtuousgeek.org>
 +M:    Bjorn Helgaas <bhelgaas@google.com>
  L:    linux-pci@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-pci/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci.git
  S:    Supported
  F:    Documentation/PCI/
  F:    drivers/pci/
  F:    include/linux/pci*
  
  PCI HOTPLUG
 -M:    Jesse Barnes <jbarnes@virtuousgeek.org>
 +M:    Bjorn Helgaas <bhelgaas@google.com>
  L:    linux-pci@vger.kernel.org
  S:    Supported
  F:    drivers/pci/hotplug
@@@ -5181,7 -5146,7 +5181,7 @@@ F:      kernel/delayacct.
  PERFORMANCE EVENTS SUBSYSTEM
  M:    Peter Zijlstra <a.p.zijlstra@chello.nl>
  M:    Paul Mackerras <paulus@samba.org>
 -M:    Ingo Molnar <mingo@elte.hu>
 +M:    Ingo Molnar <mingo@redhat.com>
  M:    Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
  S:    Supported
@@@ -5413,7 -5378,7 +5413,7 @@@ M:      Mike Isely <isely@pobox.com
  L:    pvrusb2@isely.net       (subscribers-only)
  L:    linux-media@vger.kernel.org
  W:    http://www.isely.net/pvrusb2/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    Documentation/video4linux/README.pvrusb2
  F:    drivers/media/video/pvrusb2/
@@@ -5421,7 -5386,7 +5421,7 @@@
  PXA2xx/PXA3xx SUPPORT
  M:    Eric Miao <eric.y.miao@gmail.com>
  M:    Russell King <linux@arm.linux.org.uk>
 -M:    Haojian Zhuang <haojian.zhuang@marvell.com>
 +M:    Haojian Zhuang <haojian.zhuang@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://github.com/hzhuang1/linux.git
  T:    git git://git.linaro.org/people/ycmiao/pxa-linux.git
@@@ -5436,7 -5401,7 +5436,7 @@@ F:      sound/soc/px
  
  MMP SUPPORT
  M:    Eric Miao <eric.y.miao@gmail.com>
 -M:    Haojian Zhuang <haojian.zhuang@marvell.com>
 +M:    Haojian Zhuang <haojian.zhuang@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://github.com/hzhuang1/linux.git
  T:    git git://git.linaro.org/people/ycmiao/pxa-linux.git
@@@ -5579,7 -5544,7 +5579,7 @@@ RCUTORTURE MODUL
  M:    Josh Triplett <josh@freedesktop.org>
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
  F:    Documentation/RCU/torture.txt
  F:    kernel/rcutorture.c
  
@@@ -5604,7 -5569,7 +5604,7 @@@ M:      Dipankar Sarma <dipankar@in.ibm.com
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
  W:    http://www.rdrop.com/users/paulmck/rclock/
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
  F:    Documentation/RCU/
  F:    include/linux/rcu*
  F:    include/linux/srcu*
@@@ -5633,13 -5598,6 +5633,13 @@@ S:    Supporte
  F:    drivers/base/regmap/
  F:    include/linux/regmap.h
  
 +REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
 +M:    Ohad Ben-Cohen <ohad@wizery.com>
 +S:    Maintained
 +F:    drivers/remoteproc/
 +F:    Documentation/remoteproc.txt
 +F:    include/linux/remoteproc.h
 +
  RFKILL
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linux-wireless@vger.kernel.org
@@@ -5765,19 -5723,13 +5765,19 @@@ F:   drivers/mmc/host/s3cmci.
  SAA7146 VIDEO4LINUX-2 DRIVER
  M:    Michael Hunold <michael@mihu.de>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.mihu.de/linux/saa7146
  S:    Maintained
  F:    drivers/media/common/saa7146*
  F:    drivers/media/video/*7146*
  F:    include/media/*7146*
  
 +SAMSUNG LAPTOP DRIVER
 +M:    Corentin Chary <corentincj@iksaif.net>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/samsung-laptop.c
 +
  SAMSUNG AUDIO (ASoC) DRIVERS
  M:    Sangbeom Kim <sbkim73@samsung.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -5829,7 -5781,7 +5829,7 @@@ S:      Maintaine
  F:    drivers/watchdog/sc1200wdt.c
  
  SCHEDULER
 -M:    Ingo Molnar <mingo@elte.hu>
 +M:    Ingo Molnar <mingo@redhat.com>
  M:    Peter Zijlstra <peterz@infradead.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
  S:    Maintained
@@@ -6076,8 -6028,7 +6076,8 @@@ F:      arch/arm/mach-s3c2410/bast-irq.
  TI DAVINCI MACHINE SUPPORT
  M:    Sekhar Nori <nsekhar@ti.com>
  M:    Kevin Hilman <khilman@ti.com>
 -L:    davinci-linux-open-source@linux.davincidsp.com (subscribers-only)
 +L:    davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers)
 +T:    git git://gitorious.org/linux-davinci/linux-davinci.git
  Q:    http://patchwork.kernel.org/project/linux-davinci/list/
  S:    Supported
  F:    arch/arm/mach-davinci
@@@ -6117,6 -6068,12 +6117,6 @@@ W:     http://www.winischhofer.at/linuxsisu
  S:    Maintained
  F:    drivers/usb/misc/sisusbvga/
  
 -SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS
 -M:    Stephen Hemminger <shemminger@vyatta.com>
 -L:    netdev@vger.kernel.org
 -S:    Maintained
 -F:    drivers/net/ethernet/marvell/sk*
 -
  SLAB ALLOCATOR
  M:    Christoph Lameter <cl@linux-foundation.org>
  M:    Pekka Enberg <penberg@kernel.org>
@@@ -6189,7 -6146,7 +6189,7 @@@ F:      arch/ia64/sn
  SOC-CAMERA V4L2 SUBSYSTEM
  M:    Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    include/media/v4l2*
  F:    drivers/media/video/v4l2*
@@@ -6261,8 -6218,8 +6261,8 @@@ SPARC + UltraSPARC (sparc/sparc64
  M:    "David S. Miller" <davem@davemloft.net>
  L:    sparclinux@vger.kernel.org
  Q:    http://patchwork.ozlabs.org/project/sparclinux/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git
  S:    Maintained
  F:    arch/sparc/
  F:    drivers/sbus/
@@@ -6270,8 -6227,8 +6270,8 @@@
  SPARC SERIAL DRIVERS
  M:    "David S. Miller" <davem@davemloft.net>
  L:    sparclinux@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git
  S:    Maintained
  F:    include/linux/sunserialcore.h
  F:    drivers/tty/serial/suncore.c
@@@ -6282,15 -6239,6 +6282,15 @@@ F:    drivers/tty/serial/sunsu.
  F:    drivers/tty/serial/sunzilog.c
  F:    drivers/tty/serial/sunzilog.h
  
 +SPARSE CHECKER
 +M:    "Christopher Li" <sparse@chrisli.org>
 +L:    linux-sparse@vger.kernel.org
 +W:    https://sparse.wiki.kernel.org/
 +T:    git git://git.kernel.org/pub/scm/devel/sparse/sparse.git
 +T:    git git://git.kernel.org/pub/scm/devel/sparse/chrisl/sparse.git
 +S:    Maintained
 +F:    include/linux/compiler.h
 +
  SPEAR PLATFORM SUPPORT
  M:    Viresh Kumar <viresh.kumar@st.com>
  L:    spear-devel@list.st.com
@@@ -6585,7 -6533,7 +6585,7 @@@ L:      linux-scsi@vger.kernel.or
  L:    target-devel@vger.kernel.org
  L:    http://groups.google.com/group/linux-iscsi-target-dev
  W:    http://www.linux-iscsi.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/lio-core-2.6.git master
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/lio-core.git master
  S:    Supported
  F:    drivers/target/
  F:    include/target/
@@@ -6623,10 -6571,9 +6623,10 @@@ F:    include/linux/if_team.
  TEGRA SUPPORT
  M:    Colin Cross <ccross@android.com>
  M:    Olof Johansson <olof@lixom.net>
 -M:    Stephen Warren <swarren@nvidia.com>
 +M:    Stephen Warren <swarren@wwwdotorg.org>
  L:    linux-tegra@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git
 +Q:    http://patchwork.ozlabs.org/project/linux-tegra/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
  S:    Supported
  F:    arch/arm/mach-tegra
  
@@@ -6777,7 -6724,7 +6777,7 @@@ K:      ^Subject:.*(?i)trivia
  TTY LAYER
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
  F:    drivers/tty/
  F:    drivers/tty/serial/serial_core.c
  F:    include/linux/serial_core.h
@@@ -6945,7 -6892,7 +6945,7 @@@ USB ET61X[12]51 DRIVE
  M:    Luca Risolia <luca.risolia@studio.unibo.it>
  L:    linux-usb@vger.kernel.org
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.linux-projects.org
  S:    Maintained
  F:    drivers/media/video/et61x251/
@@@ -7101,7 -7048,7 +7101,7 @@@ USB SN9C1xx DRIVE
  M:    Luca Risolia <luca.risolia@studio.unibo.it>
  L:    linux-usb@vger.kernel.org
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.linux-projects.org
  S:    Maintained
  F:    Documentation/video4linux/sn9c102.txt
@@@ -7111,7 -7058,7 +7111,7 @@@ USB SUBSYSTE
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  L:    linux-usb@vger.kernel.org
  W:    http://www.linux-usb.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
  S:    Supported
  F:    Documentation/usb/
  F:    drivers/net/usb/
@@@ -7137,7 -7084,7 +7137,7 @@@ USB VIDEO CLAS
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-uvc-devel@lists.berlios.de (subscribers-only)
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.ideasonboard.org/uvc/
  S:    Maintained
  F:    drivers/media/video/uvc/
@@@ -7146,7 -7093,7 +7146,7 @@@ USB W996[87]CF DRIVE
  M:    Luca Risolia <luca.risolia@studio.unibo.it>
  L:    linux-usb@vger.kernel.org
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.linux-projects.org
  S:    Maintained
  F:    Documentation/video4linux/w9968cf.txt
@@@ -7175,7 -7122,7 +7175,7 @@@ USB ZR364XX DRIVE
  M:    Antoine Jacquet <royale@zerezo.com>
  L:    linux-usb@vger.kernel.org
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://royale.zerezo.com/zr364xx/
  S:    Maintained
  F:    Documentation/video4linux/zr364xx.txt
@@@ -7325,7 -7272,7 +7325,7 @@@ M:      Liam Girdwood <lrg@ti.com
  M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
  W:    http://opensource.wolfsonmicro.com/node/15
  W:    http://www.slimlogic.co.uk/?p=48
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/regulator.git
  S:    Supported
  F:    drivers/regulator/
  F:    include/linux/regulator/

diff --combined net/bluetooth/hci_core.c
index e33af63a884a476e689af34a3a56003d2f485f2f,2054c1321c87e46d475739ab937369e54af39a1c..92a857e3786d173273986ba179f7e9bac1856af7
--- 1/net/bluetooth/hci_core.c
--- 2/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@@ -45,6 -45,7 +45,6 @@@
  #include <linux/crypto.h>
  #include <net/sock.h>
  
 -#include <asm/system.h>
  #include <linux/uaccess.h>
  #include <asm/unaligned.h>
  
@@@ -665,6 -666,11 +665,11 @@@ int hci_dev_open(__u16 dev
  
        hci_req_lock(hdev);
  
+       if (test_bit(HCI_UNREGISTER, &hdev->dev_flags)) {
+               ret = -ENODEV;
+               goto done;
+       }
+ 
        if (hdev->rfkill && rfkill_blocked(hdev->rfkill)) {
                ret = -ERFKILL;
                goto done;
@@@ -1849,6 -1855,8 +1854,8 @@@ void hci_unregister_dev(struct hci_dev 
  
        BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
  
+       set_bit(HCI_UNREGISTER, &hdev->dev_flags);
+ 
        write_lock(&hci_dev_list_lock);
        list_del(&hdev->list);
        write_unlock(&hci_dev_list_lock);

diff --combined net/bluetooth/l2cap_core.c
index b8e17e4dac8b4179d9ac82ad916baf28ed333662,38d934a1124a7dd2c82d4f472b6936e6feff9a5a..94552b33d528447eea4b604b996c7d90ba0ab036
--- 1/net/bluetooth/l2cap_core.c
--- 2/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@@ -49,6 -49,7 +49,6 @@@
  #include <linux/crc16.h>
  #include <net/sock.h>
  
 -#include <asm/system.h>
  #include <asm/unaligned.h>
  
  #include <net/bluetooth/bluetooth.h>
@@@ -1308,6 -1309,7 +1308,7 @@@ static void l2cap_monitor_timeout(struc
        if (chan->retry_count >= chan->remote_max_tx) {
                l2cap_send_disconn_req(chan->conn, chan, ECONNABORTED);
                l2cap_chan_unlock(chan);
+               l2cap_chan_put(chan);
                return;
        }
  
@@@ -1316,6 -1318,7 +1317,7 @@@
  
        l2cap_send_rr_or_rnr(chan, L2CAP_CTRL_POLL);
        l2cap_chan_unlock(chan);
+       l2cap_chan_put(chan);
  }
  
  static void l2cap_retrans_timeout(struct work_struct *work)
@@@ -1335,6 -1338,7 +1337,7 @@@
        l2cap_send_rr_or_rnr(chan, L2CAP_CTRL_POLL);
  
        l2cap_chan_unlock(chan);
+       l2cap_chan_put(chan);
  }
  
  static void l2cap_drop_acked_frames(struct l2cap_chan *chan)