summaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-13 11:34:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-13 11:34:05 -0700
commit44d2d371d250b44cbe40f8d47e329c97668d7594 (patch)
treed93611beede5c45bdca2a850354ab416197f4f21 /drivers/net/pcmcia/Kconfig
parent465de2ba71f5048341e0109f3f6c4d7dc65d9754 (diff)
parentc011f80ba0912486fe51dd2b3f71d9b33a151188 (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: Add some more commentary to __raw_local_irq_save() sparc64: Fix memory leak in pci_register_iommu_region(). sparc64: Add kmemleak annotation to sun4v_build_virq() sparc64: Support kmemleak. sparc64: Add function graph tracer support. sparc64: Give a stack frame to the ftrace call sites. sparc64: Use a seperate counter for timer interrupts and NMI checks, like x86. sparc64: Remove profiling from some low-level bits. sparc64: Kill unnecessary static on local var in ftrace_call_replace(). sparc64: Kill CONFIG_STACK_DEBUG code. sparc64: Add HAVE_FUNCTION_TRACE_MCOUNT_TEST and tidy up. sparc64: Adjust __raw_local_irq_save() to cooperate in NMIs. sparc64: Use kstack_valid() in die_if_kernel().
Diffstat (limited to 'drivers/net/pcmcia/Kconfig')
0 files changed, 0 insertions, 0 deletions