| commit | 189e7cc1e092a31183febe598f8e37385ff9936e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Mon Nov 13 08:03:32 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Mon Nov 13 08:03:32 2006 -0800 |
| tree | 9266d8e561d2c3c5ad0d069c1678474ff6fee3dc | |
| parent | 09123d230a294cd3b860f4ea042235b988277f0a [diff] | |
| parent | 1f10bec3ef9d9d97999c72e19625432836820221 [diff] |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [PATCH] drivers cris: return on NULL dev_alloc_skb() [PATCH] com20020 build fix [PATCH] bonding: lockdep annotation [PATCH] bcm43xx: Add error checking in bcm43xx_sprom_write() [PATCH] bcm43xx: Drain TX status before starting IRQs