summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/amd/atarilance.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-22 20:28:15 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-22 20:28:15 +0400
commitc5c7fb8fbd7cd228132b6e2a17a10f246ffc06ee (patch)
tree3cd15a14d78b399c5dbeaf8beba7599615bc40bd /drivers/net/ethernet/amd/atarilance.c
parent1b674bf106f59e04e24b3825c2f08dcd9a5b7264 (diff)
parent140f190bc3a3b6f200548d204befd998eadd63fd (diff)
parent35f1790e6c6a7e4cae57b616cf36444d27fa6b28 (diff)
parent513c4ec6e4759aa33c90af0658b82eb4d2027871 (diff)
parent42dfc43ee5999ac64284476ea0ac6c937587cf2b (diff)
parentb0deca2e0270135f797e81bdb0743e50fd1dc58d (diff)
downloadlinux-c5c7fb8fbd7cd228132b6e2a17a10f246ffc06ee.tar.xz
Merge branches 'x86-cpu-for-linus', 'x86-boot-for-linus', 'x86-cpufeature-for-linus', 'x86-process-for-linus' and 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull trivial x86 branches from Ingo Molnar: small one-liners to fix up details. * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86: Remove some noise from boot log when starting cpus * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, boot: Fix port argument to inl() function * 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, cpufeature: Add CPU features from Intel document 319433-012A * 'x86-process-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86_64: Record stack pointer before task execution begins * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/UV: Lower UV rtc clocksource rating