| commit | 3d68bd0010d2c9bc9ad6004fdcc4d6a56dcae199 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jul 17 12:49:28 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jul 17 12:49:28 2011 -0700 |
| tree | 013ac9bd1bc68d1d9dda17346eefc617aeb47265 | |
| parent | efcbae253f97bf82e7befd372da3ad5995a53f1a [diff] | |
| parent | 05e9a2f67849e427f8900bad0a3f2a939e8dd3d6 [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: 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