aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-02-08 12:16:52 -0800
committerDavid S. Miller <davem@davemloft.net>2011-02-08 12:16:52 -0800
commit3fb17dabf663216b90076f7a1649b599e90d46f1 (patch)
treea2674336f0cf89d33eb5f919292cca8b05ec08fc /net
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (diff)
parentixgbe: update version string (diff)
downloadlinux-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