diff options
author | David S. Miller <davem@davemloft.net> | 2009-04-29 01:40:49 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-04-29 01:40:49 -0400 |
commit | bf0de3e9c87fda3d1fc55ac2914948f3ca32ff9b (patch) | |
tree | 289f4ea835c270de9af81d75d6caae1d1bc00f75 /drivers/net/slip.c | |
parent | 942e4a2bd680c606af0211e64eb216be2e19bf61 (diff) | |
parent | 3fdca1e1370ffe89980927cdef0583bebcd8caaf (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'drivers/net/slip.c')
0 files changed, 0 insertions, 0 deletions