diff options
author | David S. Miller <davem@davemloft.net> | 2008-08-07 20:28:46 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-07 20:28:46 -0700 |
commit | c1c6c11a6860c8135fd0d923c3d49fb368889b10 (patch) | |
tree | 7d58008c7cf943b7b6d07f5a26d59ca9e0bdab6d /net/irda | |
parent | 2aaab9a0ccfd2ccf1c957cc2120da8d5593955c5 (diff) | |
parent | cfeb414537b1d7c23ba202f198fa4154cd5a4856 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'net/irda')
0 files changed, 0 insertions, 0 deletions