aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/r8169.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-11-29 13:44:00 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-29 13:44:00 -0800
commitaf768c6711de615abf9c679732a2f8245a4c286c (patch)
tree326f064955adb4a40045fa2a23ca6b358cd26bcb /drivers/net/r8169.c
parent[MIPS] Do topology_init even on uniprocessor kernels. (diff)
parent[ARM] 3943/1: share declaration of struct pxa2xx_udc_mach_info between multiple platforms (diff)
downloadlinux-dev-af768c6711de615abf9c679732a2f8245a4c286c.tar.xz
linux-dev-af768c6711de615abf9c679732a2f8245a4c286c.zip
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3943/1: share declaration of struct pxa2xx_udc_mach_info between multiple platforms [ARM] Export smp_call_function() [ARM] Add PM_LEGACY defaults
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions