Linus Torvalds 609106b9ac 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: (38 commits) ps3flash: Always read chunks of 256 KiB, and cache them ps3flash: Cache the last accessed FLASH chunk ps3: Replace direct file operations by callback ps3: Switch ps3_os_area_[gs]et_rtc_diff to EXPORT_SYMBOL_GPL() ps3: Correct debug message in dma_ioc0_map_pages() drivers/ps3: Add missing annotations ps3fb: Use ps3_system_bus_[gs]et_drvdata() instead of direct access ps3flash: Use ps3_system_bus_[gs]et_drvdata() instead of direct access ps3: shorten ps3_system_bus_[gs]et_driver_data to ps3_system_bus_[gs]et_drvdata ps3: Use dev_[gs]et_drvdata() instead of direct access for system bus devices block/ps3: remove driver_data direct access of struct device ps3vram: Make ps3vram_priv.reports a void * ps3vram: Remove no longer used ps3vram_priv.ddr_base ps3vram: Replace mutex by spinlock + bio_list block: Add bio_list_peek() powerpc: Use generic atomic64_t implementation on 32-bit processors lib: Provide generic atomic64_t implementation powerpc: Add compiler memory barrier to mtmsr macro powerpc/iseries: Mark signal_vsp_instruction() as maybe unused powerpc/iseries: Fix unused function warning in iSeries DT code ...		2009-06-16 11:30:37 -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	atl1c: WAKE_MCAST tested twice, not WAKE_UCAST	2009-06-11 02:32:41 -07:00
atl1e	net: ntohs() misuse	2009-06-11 17:23:24 -07:00
atlx	net: ntohs() misuse	2009-06-11 17:23:24 -07:00
benet	be2net: Fix be_tx_q_clean() being called on freed queues	2009-06-11 02:47:19 -07:00
bonding	bonding: initialization rework	2009-06-13 23:29:04 -07:00
can	can: sja1000_of_platform: fix build problems with printk format	2009-06-10 01:12:39 -07:00
chelsio	net: dont update dev->trans_start in 10GB drivers	2009-05-29 01:46:26 -07:00
cris
cxgb3	cxgb3: remove __GFP_NOFAIL usage	2009-06-11 02:47:13 -07:00
e1000	net: skb_shared_info optimization	2009-06-08 00:21:48 -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	net: dont update dev->trans_start in 10GB drivers	2009-05-29 01:46:26 -07:00
fs_enet
hamradio	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
ibm_newemac	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
igb	net: skb_shared_info optimization	2009-06-08 00:21:48 -07:00
igbvf	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -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	net: skb_shared_info optimization	2009-06-08 00:21:48 -07:00
ixgbe	ixgbe: Include offloaded FCoE data into total rx/tx statistics for 82599	2009-06-09 05:25:37 -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	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
netxen	netxen: No need to check vfree() pointer.	2009-06-11 02:49:10 -07:00
pcmcia	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
phy	net/phy/marvell: update m88e1111 support for SGMII mode	2009-06-03 02:52:45 -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	sfc: Expose 100/1000BASE-T MDI-X status via ethtool	2009-06-11 02:47:11 -07:00
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	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
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: No need for check vfree() pointer.	2009-06-11 02:47:14 -07:00
wan	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
wimax	wimax: fix gcc warnings in sh4 when calling BUG()	2009-06-11 11:47:39 -07:00
wireless	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
3c59x.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
3c501.c
3c501.h
3c503.c
3c503.h
3c505.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
3c505.h
3c507.c
3c509.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-06-03 02:43:41 -07:00
3c515.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
3c523.c
3c523.h
3c527.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
3c527.h
7990.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
7990.h
8139cp.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
8139too.c
8390.c
8390.h
8390p.c
82596.c
a2065.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
a2065.h
ac3200.c
acenic.c	net: dont update dev->trans_start	2009-05-29 01:46:27 -07:00
acenic.h
amd8111e.c
amd8111e.h
apne.c
ariadne.c
ariadne.h
at1700.c
atarilance.c
atp.c
atp.h
au1000_eth.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
au1000_eth.h
ax88796.c
b44.c	net: use netdev stats in b44, sundance, via-rhine and via-velocity	2009-05-27 15:47:07 -07:00
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	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-06-03 02:43:41 -07:00
bfin_mac.h
bmac.c
bmac.h
bnx2_fw.h
bnx2.c	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.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
bnx2x_dump.h
bnx2x_fw_defs.h
bnx2x_fw_file_hdr.h
bnx2x_hsi.h
bnx2x_init_ops.h
bnx2x_init.h
bnx2x_link.c
bnx2x_link.h
bnx2x_main.c	net: dont update dev->trans_start in 10GB drivers	2009-05-29 01:46:26 -07:00
bnx2x_reg.h
bnx2x.h
bsd_comp.c
cassini.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
cassini.h
cnic_defs.h	[SCSI] cnic: Add new Broadcom CNIC driver.	2009-06-09 10:22:42 -05:00
cnic_if.h	[SCSI] cnic: Add new Broadcom CNIC driver.	2009-06-09 10:22:42 -05:00
cnic.c	[SCSI] cnic: fix error: implicit declaration of function ‘__symbol_get’	2009-06-13 09:07:51 -05:00
cnic.h	[SCSI] cnic: Add new Broadcom CNIC driver.	2009-06-09 10:22:42 -05:00
cpmac.c	cpmac: prevent fatal exception in cpmac_end_xmit	2009-06-01 02:56:39 -07:00
cs89x0.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
cs89x0.h
davinci_emac.c	TI DaVinci EMAC: Remove print_mac, DECLARE_MAC_BUF	2009-06-03 21:54:29 -07:00
de600.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
de600.h
de620.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
de620.h
declance.c	declance: Restore tx descriptor ring locking	2009-06-08 02:42:35 -07:00
defxx.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
defxx.h
depca.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
depca.h
dl2k.c	net: dont update dev->trans_start	2009-05-29 01:46:27 -07:00
dl2k.h
dm9000.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
dm9000.h
dnet.c
dnet.h
dummy.c
e100.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
e2100.c
eepro.c
eexpress.c
eexpress.h
enc28j60_hw.h
enc28j60.c
epic100.c
eql.c
es3210.c
eth16i.c
ethoc.c	net: fix network driver ndo_start_xmit() return values (part 1)	2009-06-13 01:18:32 -07:00
ewrk3.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
ewrk3.h
fealnx.c
fec_mpc52xx_phy.c
fec_mpc52xx.c
fec_mpc52xx.h
fec.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
fec.h
forcedeth.c	forcedeth: addition of new mcp89 device id	2009-06-07 03:52:37 -07:00
fsl_pq_mdio.c	fsl_pq_mido: Set the first UCC as the mii management interface master	2009-06-03 02:52:46 -07:00
fsl_pq_mdio.h
gianfar_ethtool.c
gianfar_sysfs.c
gianfar.c
gianfar.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-06-03 02:43:41 -07:00
hamachi.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
hp100.c
hp100.h
hp-plus.c
hp.c
hplance.c
hplance.h
hydra.c
ibmlana.c	net: fix network driver ndo_start_xmit() return values (part 1)	2009-06-13 01:18:32 -07:00
ibmlana.h
ibmveth.c
ibmveth.h
ifb.c
ioc3-eth.c	net: ntohs() misuse	2009-06-11 17:23:24 -07:00
ipg.c
ipg.h	trivial: fix typo milisecond/millisecond for documentation and source comments.	2009-06-12 18:01:46 +02:00
isa-skeleton.c
iseries_veth.c
jazzsonic.c
jme.c	net: dont update dev->trans_start	2009-05-29 01:46:27 -07:00
jme.h
Kconfig	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
korina.c	korina: periodically poll the media	2009-05-29 01:51:22 -07:00
ks8842.c	netdev: Added KS8842 driver	2009-06-08 00:20:20 -07:00
lance.c
lasi_82596.c
lib8390.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
lib82596.c
LICENSE.SRC
ll_temac_main.c
ll_temac_mdio.c
ll_temac.h
lne390.c
loopback.c
lp486e.c
mac89x0.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
mac8390.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-06-03 02:43:41 -07:00
macb.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
macb.h
mace.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
mace.h
macmace.c
macsonic.c
macvlan.c	drivers/net/macvlan.c: fix cloning of tagged VLAN interfaces	2009-06-11 02:32:39 -07:00
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	mdio: Expose 10GBASE-T MDI-X status via ethtool	2009-06-11 02:47:10 -07:00
meth.c
meth.h
mii.c
mipsnet.c
mv643xx_eth.c	net: convert unicast addr list	2009-05-29 22:12:32 -07:00
mvme147.c
myri_sbus.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
myri_sbus.h
natsemi.c
ne2.c
ne2k-pci.c
ne3210.c
ne-h8300.c
ne.c
netconsole.c
netx-eth.c
ni52.c
ni52.h
ni65.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
ni65.h
ni5010.c
ni5010.h
niu.c	net: convert unicast addr list	2009-05-29 22:12:32 -07:00
niu.h	trivial: typo (en|dis|avail|remove)bale -> (en|dis|avail|remove)able	2009-06-12 18:01:45 +02:00
ns83820.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
pasemi_mac_ethtool.c
pasemi_mac.c
pasemi_mac.h
pci-skeleton.c
pcnet32.c
plip.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
ppp_async.c
ppp_deflate.c
ppp_generic.c
ppp_mppe.c
ppp_mppe.h
ppp_synctty.c
pppoe.c
pppol2tp.c	net: skb->dst accessors	2009-06-03 02:51:04 -07:00
pppox.c
ps3_gelic_net.c	ps3: shorten ps3_system_bus_[gs]et_driver_data to ps3_system_bus_[gs]et_drvdata	2009-06-15 16:47:24 +10:00
ps3_gelic_net.h
ps3_gelic_wireless.c
ps3_gelic_wireless.h
qla3xxx.c	net: dont update dev->trans_start	2009-05-29 01:46:27 -07:00
qla3xxx.h
r6040.c	r6040: check and update media status	2009-05-27 15:46:53 -07:00
r8169.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
rionet.c
rrunner.c	net: fix network driver ndo_start_xmit() return values (part 1)	2009-06-13 01:18:32 -07:00
rrunner.h
s2io-regs.h
s2io.c	s2io: Remove private boolean definitions	2009-06-08 00:20:22 -07:00
s2io.h	s2io: Remove private boolean definitions	2009-06-08 00:20:22 -07:00
sb1000.c
sb1250-mac.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
sc92031.c
seeq8005.c
seeq8005.h
sgiseeq.c
sgiseeq.h
sh_eth.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
sh_eth.h
sis190.c	sis190: fix gigabit negotiation	2009-06-08 00:15:14 -07:00
sis900.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
sis900.h
skge.c	net: dont update dev->trans_start	2009-05-29 01:46:27 -07:00
skge.h
sky2.c	net: dont update dev->trans_start	2009-05-29 01:46:27 -07:00
sky2.h
slhc.c
slip.c
slip.h
smc91x.c
smc91x.h	[ARM] pxa/stargate2: Add board specific elements to the smc91x driver	2009-06-05 10:46:25 +08:00
smc911x.c
smc911x.h
smc9194.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
smc9194.h
smc-mca.c
smc-ultra32.c
smc-ultra.c
smsc911x.c	netdev: smsc911x: add missing __devexit_p() usage	2009-06-08 00:09:44 -07:00
smsc911x.h
smsc9420.c
smsc9420.h
sni_82596.c
sonic.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
sonic.h
Space.c
spider_net_ethtool.c
spider_net.c
spider_net.h
starfire.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
stnic.c
sun3_82586.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
sun3_82586.h
sun3lance.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
sunbmac.c
sunbmac.h
sundance.c	net: use netdev stats in b44, sundance, via-rhine and via-velocity	2009-05-27 15:47:07 -07:00
sungem_phy.c
sungem_phy.h
sungem.c
sungem.h
sunhme.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
sunhme.h
sunlance.c
sunqe.c
sunqe.h
sunvnet.c
sunvnet.h
tc35815.c
tehuti.c	tehuti: No need check vfree() pointer.	2009-06-11 02:47:14 -07:00
tehuti.h
tg3.c	net: skb_shared_info optimization	2009-06-08 00:21:48 -07:00
tg3.h
tlan.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
tlan.h
tsi108_eth.c
tsi108_eth.h
tun.c	tun: Fix unregister race	2009-06-08 00:44:31 -07:00
typhoon.c
typhoon.h
ucc_geth_ethtool.c	trivial: fix typos s/paramter/parameter/ and s/excute/execute/ in documentation and source comments.	2009-06-12 18:01:46 +02:00
ucc_geth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-06-15 09:40:05 -07:00
ucc_geth.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-06-15 09:40:05 -07:00
veth.c	veth: dont release skb->dst in veth_xmit()	2009-05-29 15:15:30 -07:00
via-rhine.c	net: use netdev stats in b44, sundance, via-rhine and via-velocity	2009-05-27 15:47:07 -07:00
via-velocity.c	net: use netdev stats in b44, sundance, via-rhine and via-velocity	2009-05-27 15:47:07 -07:00
via-velocity.h	net: use netdev stats in b44, sundance, via-rhine and via-velocity	2009-05-27 15:47:07 -07:00
virtio_net.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
wd.c
xen-netfront.c
xtsonic.c
yellowfin.c	net: dont update dev->trans_start	2009-05-29 01:46:27 -07:00
znet.c
zorro8390.c