diff options
author | David S. Miller <davem@davemloft.net> | 2009-12-03 22:23:12 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-03 22:23:12 +0100 |
commit | 424eff975192553a9ea8bfd51bf65039ffb356ef (patch) | |
tree | 5fa7b15715b3ce904f7250c50d09bc921d9f28bf /net/bluetooth/hci_sock.c | |
parent | bnx2: Update version to 2.0.3. (diff) | |
parent | netfilter: net/ipv[46]/netfilter: Move && and || to end of previous line (diff) | |
download | linux-424eff975192553a9ea8bfd51bf65039ffb356ef.tar.xz linux-424eff975192553a9ea8bfd51bf65039ffb356ef.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/bluetooth/hci_sock.c')
0 files changed, 0 insertions, 0 deletions