Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
authorDavid S. Miller <davem@davemloft.net>
Sat, 19 Jul 2008 07:30:39 +0000 (00:30 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 19 Jul 2008 07:30:39 +0000 (00:30 -0700)
commit407d819cf0fd54c6fc1138a509225696aecafd15
treeb653a5c8c09f7c316f5f98947be262e27a4ca33a
parent7abbcd6a4c8d6179121f2915a761b1133bf1cd99
parentb1235d79611e78a07629b4cbe53291c9cffd1834
Merge branch 'master' of git://git./linux/kernel/git/holtmann/bluetooth-2.6
fs/compat_ioctl.c
net/bluetooth/bnep/core.c
net/bluetooth/rfcomm/core.c
net/bluetooth/rfcomm/sock.c
net/bluetooth/rfcomm/tty.c