You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 9028780a3e 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: (40 commits) [netdrvr] atl1: fix build pasemi_mac: Use local-mac-address instead of mac-address if available pasemi_mac: PHY support pasemi_mac: Add msglevel support and "debug" module param pasemi_mac: Logic cleanup / rx performance improvements pasemi_mac: Minor cleanup / define fixes pasemi_mac: Add SKB reuse / copy-break pasemi_mac: Timer and interrupt fixes pasemi_mac: Abstract and fix up interrupt restart routines pasemi_mac: Move the IRQ mapping from the PCI layer to the driver tc35815: Remove unnecessary skb->dev assignment drivers/net/dm9000: Convert to generic boolean AT91RM9200 Ethernet: Fix multicast addressing AT91RM9200 Ethernet: Support additional PHYs PCMCIA-NETDEV : xirc2ps_cs: bugfix of multicast code sky2: re-enable 88E8056 for most motherboards MIPS: Drop unnecessary CONFIG_ISA from RBTX49XX ne: MIPS: Use platform_driver for ne on RBTX49XX ne: Add NEEDS_PORTLIST to control ISA auto-probe ne: Misc fixes for platform driver. ... Fix conflict in drivers/net/pasemi_mac.c (get_property() got renamed to of_get_property()) manually. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		18 years ago
..
arc	…
au1000	…
basler/excite	[MIPS] Use DEFINE_SPINLOCK instead of SPIN_LOCK_UNLOCKED.	18 years ago
boot	…
cobalt	Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	18 years ago
configs	MIPS: Drop unnecessary CONFIG_ISA from RBTX49XX	18 years ago
ddb5xxx	…
dec	…
emma2rh	…
gt64120	[MIPS] merge GT64111 PCI routines and GT64120 PCI_0 routines	18 years ago
jazz	…
jmr3927	[MIPS] JMR3927 cleanup	18 years ago
kernel	header cleaning: don't include smp_lock.h when not used	18 years ago
lasat	…
lib	PCI: Cleanup the includes of <linux/pci.h>	18 years ago
lib-32	…
lib-64	…
math-emu	header cleaning: don't include smp_lock.h when not used	18 years ago
mips-boards	MIPSnet: Modernize use platform_device API.	18 years ago
mm	header cleaning: don't include smp_lock.h when not used	18 years ago
momentum	…
oprofile	…
pci	[MIPS] Register PCI host bridge resource earlier	18 years ago
philips/pnx8550	…
pmc-sierra	serial driver PMC MSP71xx	18 years ago
qemu	…
sgi-ip22	[MIPS] IP22: Get rid of volatile in IP22 core code.	18 years ago
sgi-ip27	header cleaning: don't include smp_lock.h when not used	18 years ago
sgi-ip32	…
sibyte	[MIPS] Add bcm1480 ZBus trace support, fix wait related bugs	18 years ago
sni	Replace deprecated SA_xxx interrupt flags	18 years ago
tx4927	ne: MIPS: Use platform_driver for ne on RBTX49XX	18 years ago
tx4938	ne: MIPS: Use platform_driver for ne on RBTX49XX	18 years ago
vr41xx	[MIPS] update vr41xx Kconfig	18 years ago
Kconfig	MIPS: Drop unnecessary CONFIG_ISA from RBTX49XX	18 years ago
Kconfig.debug	…
Makefile	[MIPS] Add bcm1480 ZBus trace support, fix wait related bugs	18 years ago
defconfig	…