diff options
| author | Linus Torvalds <[email protected]> | 2011-07-17 19:49:28 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-07-17 19:49:28 +0000 |
| commit | 3d68bd0010d2c9bc9ad6004fdcc4d6a56dcae199 (patch) | |
| tree | 013ac9bd1bc68d1d9dda17346eefc617aeb47265 /lib/fault-inject.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff) | |
| parent | Bluetooth: Fix crash with incoming L2CAP connections (diff) | |
| download | kernel-3d68bd0010d2c9bc9ad6004fdcc4d6a56dcae199.tar.gz kernel-3d68bd0010d2c9bc9ad6004fdcc4d6a56dcae199.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:
Bluetooth: Fix crash with incoming L2CAP connections
Bluetooth: Fix regression in L2CAP connection procedure
gianfar: rx parser
r6040: only disable RX interrupt if napi_schedule_prep is successful
net: remove NETIF_F_ALL_TX_OFFLOADS
net: sctp: fix checksum marking for outgoing packets
Diffstat (limited to 'lib/fault-inject.c')
0 files changed, 0 insertions, 0 deletions