diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-08 12:16:52 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-08 12:16:52 -0800 |
commit | 3fb17dabf663216b90076f7a1649b599e90d46f1 (patch) | |
tree | a2674336f0cf89d33eb5f919292cca8b05ec08fc /net | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (diff) | |
parent | ixgbe: update version string (diff) | |
download | linux-dev-3fb17dabf663216b90076f7a1649b599e90d46f1.tar.xz linux-dev-3fb17dabf663216b90076f7a1649b599e90d46f1.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-2.6
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions