aboutsummaryrefslogtreecommitdiff
path: root/fs/afs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-26 10:09:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-26 10:09:39 -0700
commitd8f654ef6a55495e548427b997a388e0d5a1ffb4 (patch)
tree31ee0a2aeccf23aeda562932d8d7c37a55a8653c /fs/afs
parent052a0cf6f85a136dc0654ec3c2d25ddd4495c65d (diff)
parent99c4a6344f6574c97019ac16e8d54bfe5ad21f2d (diff)
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: at91_can: Forgotten git 'add' of at91_can.c TI Davinci EMAC: Fix in vector definition for EMAC_VERSION_2 ax25: Fix ax25_cb refcounting in ax25_ctl_ioctl virtio_net: Check for room in the vq before adding buffer virtio_net: avoid (most) NETDEV_TX_BUSY by stopping queue early. virtio_net: formalize skb_vnet_hdr virtio_net: don't free buffers in xmit ring virtio_net: return NETDEV_TX_BUSY instead of queueing an extra skb. virtio_net: skb_orphan() and nf_reset() in xmit path.
Diffstat (limited to 'fs/afs')
0 files changed, 0 insertions, 0 deletions