Marcel Holtmann
068d69e5bb
Bluetooth: Move SCO timeout constants into net/bluetooth/sco.c ...
There is no external user of the SCO timeout constants and thus
move them into net/bluetooth/sco.c where they are actuallu used.
In addition just remove SCO_CONN_IDLE_TIMEOUT since it is unused.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
2014-07-11 13:58:58 +03:00
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-06-12 19:18:49 -07:00
Merge branch 'drm-next-3.16' of git://people.freedesktop.org/~agd5f/linux into drm-next
2014-06-10 13:09:01 +10:00
Merge branch 'for-v3.16/ti-clk-drv' of github.com:t-kristo/linux-pm into clk-next
2014-06-10 16:53:25 -07:00
mac80211: add API to request TDLS operation from userspace
2014-06-23 14:28:17 +02:00
Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2014-06-12 23:04:28 -07:00
Bluetooth: Move SCO timeout constants into net/bluetooth/sco.c
2014-07-11 13:58:58 +03:00
Merge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4', 'mlx5', 'noio', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next
2014-06-10 10:12:14 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-06-12 22:38:32 -07:00
ALSA: core: Use ktime_get_ts()
2014-06-12 12:58:16 +02:00
target: Report correct response length for some commands
2014-06-11 12:15:30 -07:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-06-12 19:42:15 -07:00
cfg80211: pass TDLS initiator in tdls_mgmt operations
2014-06-23 14:24:55 +02:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2014-06-12 11:32:30 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-06-12 14:27:40 -07:00
068d69e5bb