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

diff --cc fs/compat_ioctl.c
Simple merge

diff --cc net/bluetooth/bnep/core.c
Simple merge

diff --cc net/bluetooth/rfcomm/core.c
Simple merge

diff --cc net/bluetooth/rfcomm/sock.c
Simple merge

diff --cc net/bluetooth/rfcomm/tty.c
Simple merge