Linus Torvalds 773d7a09e1 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (35 commits) powerpc/5121: make clock debug output more readable powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function powerpc/5200: Update pcm030.dts to add i2c eeprom and delete cruft powerpc/5200: convert mpc52xx_psc_spi to use cs_control callback fbdev/xilinxfb: Fix improper casting and tighen up probe path usb/ps3: Add missing annotations powerpc: Add memory clobber to mtspr() powerpc: Fix invalid construct in our CPU selection Kconfig ps3rom: Use ps3_system_bus_[gs]et_drvdata() instead of direct access powerpc: Add configurable -Werror for arch/powerpc of_serial: Add UPF_FIXED_TYPE flag drivers/hvc: Add missing __devexit_p() net/ps3: gelic - Add missing annotations powerpc: Introduce macro spin_event_timeout() powerpc/warp: Fix ISA_DMA_THRESHOLD default powerpc/bootwrapper: Custom build options for XPedite52xx targets powerpc/85xx: Add defconfig for X-ES MPC85xx boards powerpc/85xx: Add dts files for X-ES MPC85xx boards powerpc/85xx: Add platform support for X-ES MPC85xx boards 83xx: add support for the kmeter1 board. ...		2009-06-19 17:40:40 -07:00
..
appletalk	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
arcnet
arm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
atl1c
atl1e
atlx
benet
bonding	bonding: initialization rework	2009-06-13 23:29:04 -07:00
can
chelsio
cris
cxgb3
e1000	net: group address list and its count	2009-06-18 00:29:08 -07:00
e1000e	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
ehea	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
enic
fs_enet
hamradio	net: fix network drivers ndo_start_xmit() return values	2009-06-17 04:31:16 -07:00
ibm_newemac
igb
igbvf	convert some DMA_nnBIT_MASK() callers	2009-06-19 16:46:06 -07:00
irda	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6	2009-06-13 17:08:11 -07:00
ixgb
ixgbe	convert some DMA_nnBIT_MASK() callers	2009-06-19 16:46:06 -07:00
ixp2000
mlx4	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
myri10ge
netxen	netxen: fix tx ring accounting	2009-06-18 00:46:14 -07:00
pcmcia
phy	phy_device: fix parameter name in kernel-doc	2009-06-17 04:31:20 -07:00
qlge	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
sfc
skfp	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
tokenring	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
tulip
usb	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
vxge	vxge: Enable SRIOV support in the driver.	2009-06-17 04:31:14 -07:00
wan	net: fix network drivers ndo_start_xmit() return values	2009-06-17 04:31:16 -07:00
wimax	debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.	2009-06-15 21:30:28 -07:00
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-06-18 14:07:15 -07:00
3c59x.c
3c501.c
3c501.h
3c503.c
3c503.h
3c505.c
3c505.h
3c507.c
3c509.c
3c515.c
3c523.c
3c523.h
3c527.c
3c527.h
7990.c
7990.h
8139cp.c
8139too.c
8390.c
8390.h
8390p.c
82596.c
a2065.c
a2065.h
ac3200.c
acenic.c
acenic.h
amd8111e.c
amd8111e.h
apne.c
ariadne.c
ariadne.h
at1700.c
atarilance.c
atp.c
atp.h
au1000_eth.c
au1000_eth.h
ax88796.c
b44.c
b44.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
bfin_mac.c
bfin_mac.h
bmac.c
bmac.h
bnx2.c	net: group address list and its count	2009-06-18 00:29:08 -07:00
bnx2.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
bnx2_fw.h
bnx2x.h
bnx2x_dump.h
bnx2x_fw_defs.h
bnx2x_fw_file_hdr.h
bnx2x_hsi.h
bnx2x_init.h
bnx2x_init_ops.h
bnx2x_link.c
bnx2x_link.h
bnx2x_main.c
bnx2x_reg.h
bsd_comp.c
cassini.c
cassini.h
cnic.c	[SCSI] cnic: fix error: implicit declaration of function ‘__symbol_get’	2009-06-13 09:07:51 -05:00
cnic.h
cnic_defs.h
cnic_if.h
cpmac.c
cs89x0.c
cs89x0.h
davinci_emac.c	TI DaVinci EMAC : Fix rmmod error	2009-06-18 00:29:08 -07:00
de600.c
de600.h
de620.c
de620.h
declance.c
defxx.c
defxx.h
depca.c
depca.h
dl2k.c
dl2k.h
dm9000.c
dm9000.h
dnet.c
dnet.h
dummy.c
e100.c	Net / e100: Fix suspend of devices that cannot be power managed	2009-06-18 00:29:10 -07:00
e2100.c
eepro.c
eexpress.c
eexpress.h
enc28j60.c
enc28j60_hw.h
epic100.c
eql.c
es3210.c
eth16i.c
ethoc.c
ewrk3.c
ewrk3.h
fealnx.c
fec.c
fec.h
fec_mpc52xx.c	Merge commit 'gcl/merge' into next	2009-06-18 11:22:08 +10:00
fec_mpc52xx.h
fec_mpc52xx_phy.c	Merge commit 'gcl/merge' into next	2009-06-18 11:22:08 +10:00
forcedeth.c	forcedeth: fix dma api mismatches	2009-06-18 00:46:13 -07:00
fsl_pq_mdio.c
fsl_pq_mdio.h
gianfar.c
gianfar.h
gianfar_ethtool.c
gianfar_sysfs.c
hamachi.c
hp-plus.c
hp.c
hp100.c	net: fix network drivers ndo_start_xmit() return values	2009-06-17 04:31:16 -07:00
hp100.h
hplance.c
hplance.h
hydra.c
ibmlana.c
ibmlana.h
ibmveth.c
ibmveth.h
ifb.c
ioc3-eth.c
ipg.c
ipg.h
isa-skeleton.c
iseries_veth.c
jazzsonic.c
jme.c
jme.h
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2009-06-17 09:50:44 -07:00
korina.c
ks8842.c
lance.c
lasi_82596.c
lib8390.c
lib82596.c
LICENSE.SRC
ll_temac.h
ll_temac_main.c
ll_temac_mdio.c
lne390.c
loopback.c
lp486e.c
mac89x0.c
mac8390.c
macb.c
macb.h
mace.c
mace.h
macmace.c
macsonic.c
macvlan.c
Makefile	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
mdio.c
meth.c
meth.h
mii.c
mipsnet.c
mv643xx_eth.c	net: group address list and its count	2009-06-18 00:29:08 -07:00
mvme147.c
myri_sbus.c
myri_sbus.h
natsemi.c
ne-h8300.c
ne.c
ne2.c
ne2k-pci.c
ne3210.c
netconsole.c
netx-eth.c
ni52.c
ni52.h
ni65.c
ni65.h
ni5010.c
ni5010.h
niu.c	net: group address list and its count	2009-06-18 00:29:08 -07:00
niu.h
ns83820.c
pasemi_mac.c
pasemi_mac.h
pasemi_mac_ethtool.c
pci-skeleton.c
pcnet32.c
plip.c
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	net/ps3: gelic - Add missing annotations	2009-06-16 14:15:44 +10:00
ps3_gelic_net.h
ps3_gelic_wireless.c	net/ps3: gelic - Add missing annotations	2009-06-16 14:15:44 +10:00
ps3_gelic_wireless.h
qla3xxx.c
qla3xxx.h
r6040.c
r8169.c	r8169: do not bring device down when suspending	2009-06-17 18:46:47 -07:00
rionet.c
rrunner.c
rrunner.h
s2io-regs.h
s2io.c
s2io.h
sb1000.c
sb1250-mac.c
sc92031.c
seeq8005.c
seeq8005.h
sgiseeq.c
sgiseeq.h
sh_eth.c
sh_eth.h
sis190.c	sis190: use an adequate phy list entry as a fallback	2009-06-17 18:46:46 -07:00
sis900.c
sis900.h
skge.c
skge.h
sky2.c	sky2: version 1.23	2009-06-17 18:49:48 -07:00
sky2.h	sky2: skb recycling	2009-06-17 18:46:54 -07:00
slhc.c
slip.c
slip.h
smc-mca.c
smc-ultra.c
smc-ultra32.c
smc91x.c
smc91x.h
smc911x.c
smc911x.h
smc9194.c
smc9194.h
smsc911x.c
smsc911x.h
smsc9420.c
smsc9420.h
sni_82596.c
sonic.c	sonic: Fix build after ndo_start_xmit() changes.	2009-06-17 01:36:23 -07:00
sonic.h
Space.c
spider_net.c
spider_net.h
spider_net_ethtool.c
starfire.c
stnic.c
sun3_82586.c
sun3_82586.h
sun3lance.c
sunbmac.c
sunbmac.h
sundance.c
sungem.c
sungem.h
sungem_phy.c
sungem_phy.h
sunhme.c
sunhme.h
sunlance.c
sunqe.c
sunqe.h
sunvnet.c
sunvnet.h
tc35815.c
tehuti.c
tehuti.h
tg3.c
tg3.h
tlan.c
tlan.h
tsi108_eth.c
tsi108_eth.h
tun.c	Driver Core: misc: add nodename support for misc devices.	2009-06-15 21:30:25 -07:00
typhoon.c
typhoon.h
ucc_geth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-06-18 14:07:15 -07:00
ucc_geth.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-06-18 14:07:15 -07:00
ucc_geth_ethtool.c
veth.c
via-rhine.c
via-velocity.c	via-velocity : fix no link detection on boot	2009-06-18 00:29:11 -07:00
via-velocity.h
virtio_net.c	net: group address list and its count	2009-06-18 00:29:08 -07:00
wd.c
xen-netfront.c	xen: remove driver_data direct access of struct device from more drivers	2009-06-15 21:30:28 -07:00
xtsonic.c
yellowfin.c
znet.c
zorro8390.c