diff options
author | David S. Miller <davem@davemloft.net> | 2009-08-14 16:07:21 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-14 16:07:21 -0700 |
commit | cf9911166113e471e1796eaf273982d8e43b138d (patch) | |
tree | 141ca87902690967620d6297c88746e2adb6dae5 /net/8021q | |
parent | sky2: version 1.24 (diff) | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (diff) | |
download | linux-dev-cf9911166113e471e1796eaf273982d8e43b138d.tar.xz linux-dev-cf9911166113e471e1796eaf273982d8e43b138d.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/8021q')
0 files changed, 0 insertions, 0 deletions