summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/realtek/r8169.c
diff options
context:
space:
mode:
authorLinus Torvalds2012-06-13 22:19:34 +0200
committerLinus Torvalds2012-06-13 22:19:34 +0200
commit790b9d4bb7614252e133d4a99ef18c1734d69163 (patch)
treee39c2f1636fd429ae71180ad6fbe2aff7ef13f5e /drivers/net/ethernet/realtek/r8169.c
parentMerge branch 'fixes-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentMerge branches 'sh/urgent', 'sh/core', 'sh/clockevents', 'sh/asm-generic' and... (diff)
downloadkernel-qcow2-linux-790b9d4bb7614252e133d4a99ef18c1734d69163.tar.gz
kernel-qcow2-linux-790b9d4bb7614252e133d4a99ef18c1734d69163.tar.xz
kernel-qcow2-linux-790b9d4bb7614252e133d4a99ef18c1734d69163.zip
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
Pull SuperH fixes from Paul Mundt. * tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: sh: Kill off additional asm-generic wrappers. sh: Setup CROSS_COMPILE at the top sh: Fix up link time defsym warnings. sh: use the new generic strnlen_user() function sh: switch to generic strncpy_from_user(). sh: Kill off last dead UBC header serial: sh-sci: Make probe fail for ports that exceed the maximum count serial: sh-sci: Fix probe error paths clocksource: sh_tmu: Use clockevents_config_and_register(). clocksource: sh_tmu: Convert timer lock to raw spinlock. clocksource: sh_mtu2: Convert timer lock to raw spinlock. clocksource: sh_cmt: Convert timer lock to raw spinlock. bug.h: need linux/kernel.h for TAINT_WARN. sh: convert to kbuild asm-generic support. sh64: Fix up fallout from generic init_task conversion. sh: arch/sh/kernel/process.c needs asm/fpu.h for unlazy_fpu().
Diffstat (limited to 'drivers/net/ethernet/realtek/r8169.c')
0 files changed, 0 insertions, 0 deletions