Linus Torvalds
e389f9aec6
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: (107 commits)
smc911x: fix compilation breakage wjen debug is on
[netdrvr] eexpress: minor corrections
add NAPI support to sb1250-mac.c
ixgb: ROUND_UP macro cleanup in drivers/net/ixgb
e1000: ROUND_UP macro cleanup in drivers/net/e1000
Generic HDLC sparse annotations
e100: Optionally use I/O mode only to access register space
e100: allow bad MAC address when running with invalid eeprom csum
ehea: fix for dlpar support
ehea: fix for sysfs entries
3C509: Remove unnecessary include of <linux/pm_legacy.h>
NetXen: Fix for vmalloc issues
NetXen: Fixes for Power PC architecture
NetXen: Port swap feature for multi port cards
NetXen: Removal of redundant macros
NetXen: Multi PCI support for Quad cards
NetXen: Removal of redundant argument passing
NetXen: Use multiple PCI functions
[netdrvr e100] experiment with doing RX in a similar manner to eepro100
[PATCH] ieee80211: add missing global needed by IEEE80211_DEBUG_XXXX
...
2007-04-29 10:48:48 -07:00
..
acpi
ACPI: Disable MSI on request of FADT
2007-04-25 01:13:47 -04:00
asm-alpha
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
2007-04-27 09:29:04 -07:00
asm-arm
[NET]: Adding SO_TIMESTAMPNS / SCM_TIMESTAMPNS support
2007-04-25 22:24:21 -07:00
asm-arm26
[NET]: Adding SO_TIMESTAMPNS / SCM_TIMESTAMPNS support
2007-04-25 22:24:21 -07:00
asm-avr32
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2007-04-27 09:26:46 -07:00
asm-cris
[NET]: Adding SO_TIMESTAMPNS / SCM_TIMESTAMPNS support
2007-04-25 22:24:21 -07:00
asm-frv
[NET]: Adding SO_TIMESTAMPNS / SCM_TIMESTAMPNS support
2007-04-25 22:24:21 -07:00
asm-generic
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2007-04-27 09:26:46 -07:00
asm-h8300
[NET]: Adding SO_TIMESTAMPNS / SCM_TIMESTAMPNS support
2007-04-25 22:24:21 -07:00
asm-i386
[NET]: Adding SO_TIMESTAMPNS / SCM_TIMESTAMPNS support
2007-04-25 22:24:21 -07:00
asm-ia64
[NET]: Adding SO_TIMESTAMPNS / SCM_TIMESTAMPNS support
2007-04-25 22:24:21 -07:00
asm-m32r
[NET]: Adding SO_TIMESTAMPNS / SCM_TIMESTAMPNS support
2007-04-25 22:24:21 -07:00
asm-m68k
[NET]: Adding SO_TIMESTAMPNS / SCM_TIMESTAMPNS support
2007-04-25 22:24:21 -07:00
asm-m68knommu
asm-mips
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2007-04-27 09:26:46 -07:00
asm-parisc
[NET]: Adding SO_TIMESTAMPNS / SCM_TIMESTAMPNS support
2007-04-25 22:24:21 -07:00
asm-powerpc
ucc_geth: Implement Transmit on Demand support
2007-04-28 11:01:04 -04:00
asm-ppc
asm-s390
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2007-04-27 09:26:46 -07:00
asm-sh
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
2007-04-27 09:29:04 -07:00
asm-sh64
[NET]: Introduce SIOCGSTAMPNS ioctl to get timestamps with nanosec resolution
2007-04-25 22:24:04 -07:00
asm-sparc
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
2007-04-27 09:29:04 -07:00
asm-sparc64
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
2007-04-27 09:29:04 -07:00
asm-um
[NET]: div64_64 consolidate (rev3)
2007-04-25 22:23:33 -07:00
asm-v850
[NET]: Adding SO_TIMESTAMPNS / SCM_TIMESTAMPNS support
2007-04-25 22:24:21 -07:00
asm-x86_64
[NET]: Adding SO_TIMESTAMPNS / SCM_TIMESTAMPNS support
2007-04-25 22:24:21 -07:00
asm-xtensa
[NET]: Adding SO_TIMESTAMPNS / SCM_TIMESTAMPNS support
2007-04-25 22:24:21 -07:00
crypto
keys
[AF_RXRPC]: Provide secure RxRPC sockets for use by userspace and kernel both
2007-04-26 15:48:28 -07:00
linux
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
2007-04-29 10:48:48 -07:00
math-emu
media
V4L/DVB (5355): Add VIDIOC_G_CHIP_IDENT to various i2c modules
2007-04-27 15:43:50 -03:00
mtd
UBI: Unsorted Block Images
2007-04-27 14:23:33 +03:00
net
[PATCH] Remove comment about IEEE80211_RADIOTAP_FCS
2007-04-28 11:01:03 -04:00
pcmcia
rdma
rxrpc
[AF_RXRPC]: Delete the old RxRPC code.
2007-04-26 15:55:48 -07:00
scsi
sound
video
Kbuild