summaryrefslogtreecommitdiffstats
path: root/drivers/net/qlcnic/qlcnic_init.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-11 16:32:20 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-11 16:32:20 -0800
commitfb7b5a956992fdc53d0b9c8ea29b51b92839dc1b (patch)
treec54022cad761358de7488d7a46bab2fa2139343f /drivers/net/qlcnic/qlcnic_init.c
parent5a62f995446be44811fefa48f91f9efb7ea172d7 (diff)
parent5edddaab1d5d6143c23fef119a24ea768915681a (diff)
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_init.c')
0 files changed, 0 insertions, 0 deletions