Linus Torvalds e80ab411e5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: (36 commits) SCSI: convert struct class_device to struct device DRM: remove unused dev_class IB: rename "dev" to "srp_dev" in srp_host structure IB: convert struct class_device to struct device memstick: convert struct class_device to struct device driver core: replace remaining __FUNCTION__ occurrences sysfs: refill attribute buffer when reading from offset 0 PM: Remove destroy_suspended_device() Firmware: add iSCSI iBFT Support PM: Remove legacy PM (fix) Kobject: Replace list_for_each() with list_for_each_entry(). SYSFS: Explicitly include required header file slab.h. Driver core: make device_is_registered() work for class devices PM: Convert wakeup flag accessors to inline functions PM: Make wakeup flags available whenever CONFIG_PM is set PM: Fix misuse of wakeup flag accessors in serial core Driver core: Call device_pm_add() after bus_add_device() in device_add() PM: Handle device registrations during suspend/resume block: send disk "change" event for rescan_partitions() sysdev: detect multiple driver registrations ... Fixed trivial conflict in include/linux/memory.h due to semaphore header file change (made irrelevant by the change to mutex).		2008-04-21 15:49:58 -07:00
..
appletalk	drivers/net/appletalk: use time_before, time_before_eq, etc	2008-04-19 18:15:41 -07:00
arcnet	drivers/net/arcnet/arcnet.c: use time_* macros	2008-03-28 22:14:15 -04:00
arm	[ARM] 4980/1: [AT91] emQbit ECB_AT91 board support	2008-04-17 15:55:51 +01:00
atlx
bonding	drivers/net/bonding/bond_main.c - remove unnecessary #define	2008-04-16 20:09:35 -04:00
can
chelsio
cris
cxgb3	net: Remove unnecessary inclusions of asm/semaphore.h	2008-04-18 22:15:50 -04:00
e1000	e1000: convert uint16_t style integers to u16	2008-04-16 20:41:45 -04:00
e1000e	e1000e: reformat register test code, fix some minor initialization	2008-04-16 20:41:37 -04:00
ehea	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-04-14 02:30:23 -07:00
fec_8xx
fs_enet	phy: Change mii_bus id field to a string	2008-04-16 20:09:35 -04:00
hamradio	Convert asm/semaphore.h users to linux/semaphore.h	2008-04-18 22:22:54 -04:00
ibm_emac
ibm_newemac	ibm_newemac: emac_tx_csum typo fix	2008-03-28 21:52:39 -04:00
igb	igb trivial annotations	2008-03-25 23:16:03 -04:00
irda	[ARM] 4971/1: pxaficp_ir: provide startup and shutdown hooks	2008-04-19 11:29:08 +01:00
ixgb	ixgb: convert uint16_t style integers to u16	2008-04-16 20:41:44 -04:00
ixgbe	Compilation fix for ixgbe_main.c.	2008-03-28 22:14:53 -04:00
ixp2000
mlx4	IB/mlx4: Fix incorrect comment	2008-04-16 21:09:35 -07:00
myri10ge
netxen	net: Remove unnecessary inclusions of asm/semaphore.h	2008-04-18 22:15:50 -04:00
pcmcia
phy	phylib: factor out get_phy_id from within get_phy_device	2008-04-17 15:31:33 -04:00
skfp	skfp annotations	2008-03-26 00:18:44 -04:00
tokenring	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-04-14 02:30:23 -07:00
tulip	[netdrvr] tulip: Better MWI workaround for 21143 rev 65 chip errata	2008-04-16 20:40:01 -04:00
usb	net: Remove unnecessary inclusions of asm/semaphore.h	2008-04-18 22:15:50 -04:00
wan	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-04-14 02:30:23 -07:00
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6	2008-04-21 15:49:58 -07:00
3c59x.c
3c501.c
3c501.h
3c503.c
3c503.h
3c505.c
3c505.h
3c507.c
3c509.c	3c509: convert to isa_driver and pnp_driver	2008-03-28 22:14:07 -04:00
3c515.c
3c523.c
3c523.h
3c527.c	Convert asm/semaphore.h users to linux/semaphore.h	2008-04-18 22:22:54 -04:00
3c527.h
7990.c
7990.h
8139cp.c
8139too.c	misc drivers/net annotations	2008-03-26 00:18:43 -04:00
8390.c
8390.h
82596.c
a2065.c
a2065.h
ac3200.c
acenic_firmware.h
acenic.c
acenic.h
amd8111e.c
amd8111e.h
apne.c
ariadne.c
ariadne.h
at1700.c
atarilance.c
atp.c	misc drivers/net annotations	2008-03-26 00:18:43 -04:00
atp.h
au1000_eth.c	phy: Change mii_bus id field to a string	2008-04-16 20:09:35 -04:00
au1000_eth.h
ax88796.c
b44.c	ssb: Fix usage of struct device used for DMAing	2008-04-15 15:04:35 -04:00
b44.h
bfin_mac.c	phy: Change mii_bus id field to a string	2008-04-16 20:09:35 -04:00
bfin_mac.h
bmac.c
bmac.h
bnx2_fw2.h
bnx2_fw.h
bnx2.c
bnx2.h
bnx2x_fw_defs.h
bnx2x_hsi.h
bnx2x_init_values.h
bnx2x_init.h
bnx2x_reg.h
bnx2x.c	BNX2X: Correct bringing chip out of reset	2008-04-09 15:25:46 -07:00
bnx2x.h
bsd_comp.c
cassini.c
cassini.h
cpmac.c	phy: Change mii_bus id field to a string	2008-04-16 20:09:35 -04:00
cs89x0.c
cs89x0.h
de600.c
de600.h
de620.c
de620.h
declance.c
defxx.c	misc drivers/net annotations	2008-03-26 00:18:43 -04:00
defxx.h
depca.c
depca.h
dl2k.c
dl2k.h
dm9000.c	dm9000 trivial annotation	2008-03-30 14:20:24 -07:00
dm9000.h
dummy.c
e100.c	e100: endianness annotations	2008-03-25 23:16:05 -04:00
e2100.c
eepro100.c
eepro.c
eexpress.c
eexpress.h
enc28j60_hw.h
enc28j60.c
epic100.c
eql.c
es3210.c
eth16i.c
ewrk3.c
ewrk3.h
fealnx.c
fec_mpc52xx_phy.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-04-17 23:56:30 -07:00
fec_mpc52xx.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-04-17 23:56:30 -07:00
fec_mpc52xx.h
fec.c
fec.h
forcedeth.c	[netdrvr] forcedeth: internal simplifications; changelog removal	2008-04-17 15:31:33 -04:00
gianfar_ethtool.c
gianfar_mii.c	phy: Change mii_bus id field to a string	2008-04-16 20:09:35 -04:00
gianfar_mii.h
gianfar_sysfs.c
gianfar.c	gianfar: Support NAPI for TX Frames	2008-04-16 20:06:50 -04:00
gianfar.h	gianfar: Support NAPI for TX Frames	2008-04-16 20:06:50 -04:00
hamachi.c
hp100.c
hp100.h
hp-plus.c
hp.c
hplance.c
hplance.h
hydra.c
ibmlana.c
ibmlana.h
ibmveth.c	net: Remove unnecessary inclusions of asm/semaphore.h	2008-04-18 22:15:50 -04:00
ibmveth.h
ifb.c
ioc3-eth.c
ipg.c
ipg.h
isa-skeleton.c
iseries_veth.c
jazzsonic.c
Kconfig	Merge branch 'merge-fixes' into devel	2008-04-19 17:17:34 +01:00
korina.c	Add support the Korina (IDT RC32434) Ethernet MAC	2008-03-26 00:19:34 -04:00
lance.c
lasi_82596.c
lib8390.c
lib82596.c
LICENSE.SRC
lne390.c
loopback.c
lp486e.c
mac89x0.c
mac8390.c
macb.c	phy: Change mii_bus id field to a string	2008-04-16 20:09:35 -04:00
macb.h
mace.c
mace.h
macmace.c
macsonic.c
macvlan.c
Makefile	Add support the Korina (IDT RC32434) Ethernet MAC	2008-03-26 00:19:34 -04:00
meth.c
meth.h
mii.c
mipsnet.c
mv643xx_eth.c	mv643xx_eth: update copyright	2008-04-16 20:06:49 -04:00
mvme147.c
myri_code.h
myri_sbus.c
myri_sbus.h
natsemi.c	natsemi: fix MMIO for PPC 44x platforms	2008-04-17 15:31:31 -04:00
ne2.c
ne2k-pci.c
ne3210.c
ne-h8300.c
ne.c
netconsole.c	netconsole: only set CON_PRINTBUFFER if the user specifies a netconsole	2008-04-15 00:49:04 -07:00
netx-eth.c
ni52.c	ni52: more unbreaking	2008-03-26 00:18:04 -04:00
ni52.h	ni52: unbreak scp_struct	2008-03-26 00:18:00 -04:00
ni65.c
ni65.h
ni5010.c
ni5010.h
niu.c
niu.h
ns83820.c
pasemi_mac.c	phy: Change mii_bus id field to a string	2008-04-16 20:09:35 -04:00
pasemi_mac.h
pci-skeleton.c
pcnet32.c
plip.c	plip: replace spin_lock_irq with spin_lock_irqsave in irq context	2008-04-01 11:16:04 -07:00
ppp_async.c
ppp_deflate.c
ppp_generic.c
ppp_mppe.c
ppp_mppe.h
ppp_synctty.c
pppoe.c
pppol2tp.c
pppox.c
ps3_gelic_net.c
ps3_gelic_net.h
ps3_gelic_wireless.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-04-17 23:56:30 -07:00
ps3_gelic_wireless.h
qla3xxx.c	qla3xxx: convert byte order of constant instead of variable	2008-03-26 00:19:43 -04:00
qla3xxx.h
r6040.c
r8169.c
rionet.c
rrunner.c
rrunner.h
s2io-regs.h
s2io.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-04-02 22:35:23 -07:00
s2io.h
saa9730.c
saa9730.h
sb1000.c	sb1000.c: make const arrays static	2008-04-16 20:41:44 -04:00
sb1250-mac.c	phy: Change mii_bus id field to a string	2008-04-16 20:09:35 -04:00
sc92031.c	sc92031: use netdev_alloc_skb	2008-04-16 20:41:35 -04:00
seeq8005.c
seeq8005.h
sgiseeq.c
sgiseeq.h
sis190.c
sis900.c
sis900.h
skge.c	netxen, phy/marvell, skge: minor checkpatch fixes	2008-03-25 23:53:24 -04:00
skge.h
sky2.c	sky2: missing chip name for Yukon Supreme	2008-04-12 01:52:35 -04:00
sky2.h
slhc.c
slip.c
slip.h
smc91x.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-04-14 02:30:23 -07:00
smc91x.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-04-17 23:56:30 -07:00
smc911x.c
smc911x.h
smc9194.c
smc9194.h
smc-mca.c
smc-ultra32.c
smc-ultra.c
sni_82596.c
sonic.c
sonic.h
Space.c
spider_net_ethtool.c
spider_net.c	spidernet: revise link status logging	2008-04-16 20:06:50 -04:00
spider_net.h	spidernet: change interrupt masks	2008-04-16 20:06:50 -04:00
starfire_firmware.h
starfire_firmware.pl
starfire.c	[NET]: Undo code bloat in hot paths due to print_mac().	2008-04-08 16:50:44 -07:00
stnic.c
sun3_82586.c
sun3_82586.h
sun3lance.c
sunbmac.c
sunbmac.h
sundance.c
sungem_phy.c
sungem_phy.h
sungem.c
sungem.h
sunhme.c
sunhme.h
sunlance.c
sunqe.c
sunqe.h
sunvnet.c
sunvnet.h
tc35815.c	tc35815: Statistics cleanup	2008-04-17 15:31:31 -04:00
tehuti_fw.h
tehuti.c
tehuti.h
tg3.c	tg3: 5701 DMA corruption fix	2008-04-19 18:12:33 -07:00
tg3.h	tg3: 5701 DMA corruption fix	2008-04-19 18:12:33 -07:00
tlan.c
tlan.h
tsi108_eth.c
tsi108_eth.h
tun.c	[TUN]: Allow to register tun devices in namespace.	2008-04-16 00:41:53 -07:00
typhoon-firmware.h
typhoon.c
typhoon.h
ucc_geth_ethtool.c
ucc_geth_mii.c	phy: Change mii_bus id field to a string	2008-04-16 20:09:35 -04:00
ucc_geth_mii.h
ucc_geth.c	phy: Change mii_bus id field to a string	2008-04-16 20:09:35 -04:00
ucc_geth.h	phy: Change mii_bus id field to a string	2008-04-16 20:09:35 -04:00
veth.c
via-rhine.c
via-velocity.c
via-velocity.h
virtio_net.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-04-11 08:10:24 -07:00
wd.c
xen-netfront.c
yellowfin.c	net: yellowfin parenthesis fix	2008-03-28 22:14:49 -04:00
znet.c
zorro8390.c