diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-11 16:32:20 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-11 16:32:20 -0800 |
commit | fb7b5a956992fdc53d0b9c8ea29b51b92839dc1b (patch) | |
tree | c54022cad761358de7488d7a46bab2fa2139343f /drivers/net/qlcnic/qlcnic_ethtool.c | |
parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (diff) | |
parent | sparc64: Fix bootup regression due to perf init ordering. (diff) | |
download | linux-dev-fb7b5a956992fdc53d0b9c8ea29b51b92839dc1b.tar.xz linux-dev-fb7b5a956992fdc53d0b9c8ea29b51b92839dc1b.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix bootup regression due to perf init ordering.
Diffstat (limited to 'drivers/net/qlcnic/qlcnic_ethtool.c')
0 files changed, 0 insertions, 0 deletions