aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/via-velocity.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-04 07:54:00 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-04 07:54:00 -0800
commit024bb9617e01716c5ac7d235f54483cc6018978f (patch)
tree995fa77058bb980b891ca7cbe383399e1e81a8cb /drivers/net/via-velocity.c
parent25431e900dc47abb312c9ae8599e8c8ae038eb5a (diff)
parent9b02605826903203d5301049c1f52e722584785c (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: Kill bogus TPC/address truncation during 32-bit faults. sparc: fixup for sparseirq changes sparc64: Validate kernel generated fault addresses on sparc64. sparc64: On non-Niagara, need to touch NMI watchdog in NOHZ mode. sparc64: Implement NMI watchdog on capable cpus. sparc: Probe PMU type and record in sparc_pmu_type. sparc64: Move generic PCR support code to seperate file.
Diffstat (limited to 'drivers/net/via-velocity.c')
0 files changed, 0 insertions, 0 deletions