Linus Torvalds 1f1c2881f6 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: (37 commits) forcedeth bug fix: realtek phy forcedeth bug fix: vitesse phy forcedeth bug fix: cicada phy atl1: reorder atl1_main functions atl1: fix excessively indented code atl1: cleanup atl1_main atl1: header file cleanup atl1: remove irq_sem cdc-subset to support new vendor/product ID 8139cp: implement the missing dev->tx_timeout myri10ge: Remove nonsensical limit in the tx done routine gianfar: kill unused header EP93XX_ETH must select MII macb: Add multicast capability macb: Use generic PHY layer s390: add barriers to qeth driver s390: scatter-gather for inbound traffic in qeth driver eHEA: Introducing support vor DLPAR memory add Fix a potential NULL pointer dereference in free_shared_mem() in drivers/net/s2io.c [PATCH] softmac: Fix ESSID problem ...		2007-07-16 17:48:54 -07:00
..
at91_adc.h	[ARM] at91_adc parenthesis balance	2007-05-20 20:08:48 +01:00
at91_aic.h
at91_dbgu.h	[ARM] 4391/1: make at91 debug unit support optional	2007-07-12 11:11:21 +01:00
at91_ecc.h
at91_lcdc.h
at91_mci.h
at91_pio.h
at91_pit.h
at91_pmc.h
at91_rstc.h	[ARM] at91: correct value for AT91_RSTC_KEY	2007-02-16 13:06:01 +00:00
at91_rtc.h
at91_rtt.h
at91_shdwc.h	[ARM] 4421/1: AT91: Value of _KEY fields.	2007-06-03 17:52:35 +01:00
at91_spi.h
at91_ssc.h
at91_st.h
at91_tc.h
at91_twi.h
at91_wdt.h	[ARM] 4421/1: AT91: Value of _KEY fields.	2007-06-03 17:52:35 +01:00
at91rm9200_emac.h
at91rm9200_mc.h
at91rm9200.h	[ARM] 4363/1: AT91: Remove legacy PIO definitions	2007-05-08 20:45:21 +01:00
at91sam9rl_matrix.h	[ARM] 4370/3: AT91: Support for Atmel AT91SAM9RL processors.	2007-05-11 21:07:54 +01:00
at91sam9rl.h	[ARM] 4370/3: AT91: Support for Atmel AT91SAM9RL processors.	2007-05-11 21:07:54 +01:00
at91sam926x_mc.h	[ARM] 4145/2: AT91: Add support for AT91SAM9263 processor	2007-02-08 14:55:24 +00:00
at91sam9260_matrix.h
at91sam9260.h	[ARM] 4363/1: AT91: Remove legacy PIO definitions	2007-05-08 20:45:21 +01:00
at91sam9261_matrix.h
at91sam9261.h	[ARM] 4363/1: AT91: Remove legacy PIO definitions	2007-05-08 20:45:21 +01:00
at91sam9263_matrix.h	[ARM] 4145/2: AT91: Add support for AT91SAM9263 processor	2007-02-08 14:55:24 +00:00
at91sam9263.h	[ARM] 4363/1: AT91: Remove legacy PIO definitions	2007-05-08 20:45:21 +01:00
at91x40.h	[ARM] 4427/1: base Atmel at91x40 architecture defines	2007-07-12 11:11:21 +01:00
board.h	macb: Use generic PHY layer	2007-07-16 18:28:04 -04:00
cpu.h	[ARM] 4427/1: base Atmel at91x40 architecture defines	2007-07-12 11:11:21 +01:00
debug-macro.S
dma.h
entry-macro.S	[ARM] Merge remaining IOP code	2007-02-20 10:52:43 +00:00
gpio.h	[PATCH] gpio_direction_output() needs an initial value	2007-03-16 19:25:04 -07:00
hardware.h	[ARM] 4428/1: modify at91 includes to handle non-MMU at91x40 family	2007-07-12 11:11:25 +01:00
io.h	[ARM] 4369/1: AT91: Fix circular dependency in header files	2007-05-11 17:20:31 +01:00
irqs.h	[ARM] 4369/1: AT91: Fix circular dependency in header files	2007-05-11 17:20:31 +01:00
memory.h
system.h
timex.h	[ARM] 4427/1: base Atmel at91x40 architecture defines	2007-07-12 11:11:21 +01:00
uncompress.h	[ARM] 4391/1: make at91 debug unit support optional	2007-07-12 11:11:21 +01:00
vmalloc.h