summaryrefslogtreecommitdiffstats
path: root/drivers/net/phy/micrel.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-06-03 10:05:18 +0200
committerIngo Molnar <mingo@kernel.org>2015-06-03 10:05:18 +0200
commit34e7724c0767f04f6199f2bd7232e9ab1207e1df (patch)
treee9facc4481cca688b9f2fc35c7a622d6f003eb0f /drivers/net/phy/micrel.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
parentx86/mm: Mark arch_ioremap_p{m,u}d_supported() __init (diff)
parentx86/kconfig: Fix the CONFIG_NR_CPUS description (diff)
parentx86/irq: Show statistics information for posted-interrupts (diff)
parentx86/platform/atom/punit: Add Punit device state debug driver (diff)
downloadlinux-34e7724c0767f04f6199f2bd7232e9ab1207e1df.tar.xz
linux-34e7724c0767f04f6199f2bd7232e9ab1207e1df.zip
Merge branches 'x86/mm', 'x86/build', 'x86/apic' and 'x86/platform' into x86/core, to apply dependent patch
Signed-off-by: Ingo Molnar <mingo@kernel.org>