Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
David S. Miller [Sat, 19 Jul 2008 07:30:39 +0000 (00:30 -0700)]
1  2 
fs/compat_ioctl.c
net/bluetooth/bnep/core.c
net/bluetooth/rfcomm/core.c
net/bluetooth/rfcomm/sock.c
net/bluetooth/rfcomm/tty.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge