summaryrefslogtreecommitdiffstats
path: root/init/calibrate.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-04-11 22:44:25 +0200
committerDavid S. Miller <davem@davemloft.net>2011-04-11 22:44:25 +0200
commit1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch)
tree0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /init/calibrate.c
parentniu: Recognise original ethtool class code for AH/ESP flow hashing (diff)
parentcaif: performance bugfix - allow radio stack to prioritize packets. (diff)
downloadlinux-1c01a80cfec6f806246f31ff2680cd3639b30e67.tar.xz
linux-1c01a80cfec6f806246f31ff2680cd3639b30e67.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/smsc911x.c
Diffstat (limited to 'init/calibrate.c')
0 files changed, 0 insertions, 0 deletions