summaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-16 01:30:22 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-16 01:30:22 +0100
commit7004405cb85cdc10074740705963d9ce3e887f47 (patch)
treec78a69420f7307ac04866d1ad4d9a9384054bdb0 /arch/um
parentDefine smp_call_function_many for UP (diff)
parentPhonet: keep TX queue disabled when the device is off (diff)
downloadlinux-7004405cb85cdc10074740705963d9ce3e887f47.tar.xz
linux-7004405cb85cdc10074740705963d9ce3e887f47.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: Phonet: keep TX queue disabled when the device is off SCHED: netem: Correct documentation comment in code. netfilter: update rwlock initialization for nat_table netlabel: Compiler warning and NULL pointer dereference fix e1000e: fix double release of mutex IA64: HP_SIMETH needs to depend upon NET netpoll: fix race on poll_list resulting in garbage entry ipv6: silence log messages for locally generated multicast sungem: improve ethtool output with internal pcs and serdes tcp: tcp_vegas cong avoid fix sungem: Make PCS PHY support partially work again.
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions