breeze/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-02-04 15:28:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
dcc4d72fad84adcd98cb0a552f4287c1ed06d5d6
linux/drivers/net
History
Linus Torvalds 99dff58562 Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (48 commits)
  serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.
  tty/serial: Fix break handling for PORT_TEGRA
  tty/serial: Add explicit PORT_TEGRA type
  n_tracerouter and n_tracesink ldisc additions.
  Intel PTI implementaiton of MIPI 1149.7.
  Kernel documentation for the PTI feature.
  export kernel call get_task_comm().
  tty: Remove to support serial for S5P6442
  pch_phub: Support new device ML7223
  8250_pci: Add support for the Digi/IBM PCIe 2-port Adapter
  ASoC: Update cx20442 for TTY API change
  pch_uart: Support new device ML7223 IOH
  parport: Use request_muxed_region for IT87 probe and lock
  tty/serial: add support for Xilinx PS UART
  n_gsm: Use print_hex_dump_bytes
  drivers/tty/moxa.c: Put correct tty value
  TTY: tty_io, annotate locking functions
  TTY: serial_core, remove superfluous set_task_state
  TTY: serial_core, remove invalid test
  Char: moxa, fix locking in moxa_write
  ...

Fix up trivial conflicts in drivers/bluetooth/hci_ldisc.c and
drivers/tty/serial/Makefile.

I did the hci_ldisc thing as an evil merge, cleaning things up.
2011-05-23 12:23:20 -07:00
..
appletalk
…
arcnet
…
arm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2011-05-20 13:43:21 -07:00
atl1c
atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
2011-05-19 18:44:41 -04:00
atl1e
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
atlx
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
benet
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
bna
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
bnx2x
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
bonding
net: rename NETDEV_BONDING_DESLAVE to NETDEV_RELEASE
2011-05-22 21:01:19 -04:00
caif
tty: make receive_buf() return the amout of bytes received
2011-04-22 17:31:53 -07:00
can
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2011-05-23 12:23:20 -07:00
chelsio
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
cris
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2011-04-11 13:44:25 -07:00
cxgb3
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
cxgb4
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
cxgb4vf
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
e1000
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
e1000e
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
ehea
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
enic
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
fs_enet
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2011-05-20 13:43:21 -07:00
hamradio
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2011-05-23 12:23:20 -07:00
ibm_newemac
net: ibm_newemac: convert to hw_features
2011-04-17 17:47:36 -07:00
igb
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
igbvf
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
irda
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2011-05-23 12:23:20 -07:00
ixgb
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
ixgbe
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
ixgbevf
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
ixp2000
…
mlx4
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
myri10ge
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
netxen
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
octeon
…
pch_gbe
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
pcmcia
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
phy
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
qlcnic
qlcnic: Bumped up version number to 5.0.18
2011-05-13 14:44:14 -04:00
qlge
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
sfc
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
skfp
…
stmmac
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
tile
net:use help function of skb_checksum_start_offset to calculate offset
2011-04-28 13:28:57 -07:00
tokenring
olympic: convert to seq_file
2011-05-13 16:50:49 -04:00
tulip
tulip: Use pr_<level> where appropriate
2011-05-09 12:51:16 -07:00
usb
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
vmxnet3
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2011-05-17 17:33:11 -04:00
vxge
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
wan
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2011-05-23 12:23:20 -07:00
wimax
…
wireless
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
xen-netback
xen: netback: use __CONST_RING_SIZE not __RING_SIZE
2011-05-17 15:27:35 -04:00
3c59x.c
net: fix section mismatches
2011-04-18 22:59:04 -07:00
3c501.c
…
3c501.h
…
3c503.c
…
3c503.h
…
3c505.c
…
3c505.h
…
3c507.c
…
3c509.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
3c515.c
…
3c523.c
…
3c523.h
…
3c527.c
…
3c527.h
…
7990.c
…
7990.h
…
8139cp.c
net: 8139cp: convert to hw_features
2011-04-10 18:55:19 -07:00
8139too.c
…
8390.c
…
8390.h
…
8390p.c
…
82596.c
…
a2065.c
…
a2065.h
…
ac3200.c
…
acenic.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2011-05-20 13:43:21 -07:00
acenic.h
…
amd8111e.c
amd8111e: trivial typo spelling: Negotitate -> Negotiate
2011-05-02 14:42:55 -07:00
amd8111e.h
…
apne.c
…
ariadne.c
…
ariadne.h
…
at1700.c
…
atarilance.c
m68k/atari: Do not use "/" in interrupt names
2011-05-19 18:19:10 +02:00
atp.c
…
atp.h
…
au1000_eth.c
…
au1000_eth.h
…
ax88796.c
…
b44.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
b44.h
…
bcm63xx_enet.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
bcm63xx_enet.h
…
bfin_mac.c
…
bfin_mac.h
…
bmac.c
…
bmac.h
…
bnx2_fw.h
…
bnx2.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2011-05-05 14:59:02 -07:00
bnx2.h
net: bnx2: convert to hw_features
2011-04-10 18:55:21 -07:00
bsd_comp.c
…
cassini.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
cassini.h
…
cnic_defs.h
…
cnic_if.h
…
cnic.c
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
cnic.h
…
cpmac.c
…
cs89x0.c
…
cs89x0.h
…
davinci_cpdma.c
…
davinci_cpdma.h
…
davinci_emac.c
…
davinci_mdio.c
…
de600.c
…
de600.h
…
de620.c
…
de620.h
…
declance.c
…
defxx.c
…
defxx.h
…
depca.c
net: fix section mismatches
2011-04-18 22:59:04 -07:00
depca.h
…
dl2k.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
dl2k.h
…
dm9000.c
net: dm9000: Fix build
2011-04-18 14:19:32 -07:00
dm9000.h
…
dnet.c
…
dnet.h
…
dummy.c
net: call dev_alloc_name from register_netdevice
2011-05-05 10:57:45 -07:00
e100.c
e100: implemenet set_phys_id
2011-05-07 03:08:38 -07:00
e2100.c
…
eepro.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
eexpress.c
…
eexpress.h
…
enc28j60_hw.h
…
enc28j60.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
epic100.c
…
eql.c
…
es3210.c
…
eth16i.c
…
ethoc.c
…
ewrk3.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
ewrk3.h
…
fealnx.c
…
fec_mpc52xx_phy.c
…
fec_mpc52xx.c
…
fec_mpc52xx.h
…
fec.c
…
fec.h
…
forcedeth.c
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
fsl_pq_mdio.c
…
fsl_pq_mdio.h
…
ftmac100.c
net: ftmac100: fix scheduling while atomic during PHY link status change
2011-04-29 12:41:59 -07:00
ftmac100.h
…
gianfar_ethtool.c
net: gianfar: convert to hw_features
2011-04-15 15:50:41 -07:00
gianfar_sysfs.c
…
gianfar.c
net: gianfar: convert to hw_features
2011-04-15 15:50:41 -07:00
gianfar.h
net: gianfar: convert to hw_features
2011-04-15 15:50:41 -07:00
greth.c
net: greth: convert to hw_features
2011-04-17 17:47:36 -07:00
greth.h
net: greth: convert to hw_features
2011-04-17 17:47:36 -07:00
hamachi.c
hamachi: Put back RX_CHECKSUM
2011-05-07 22:31:35 -07:00
hp100.c
net: fix section mismatches
2011-04-18 22:59:04 -07:00
hp100.h
…
hp-plus.c
…
hp.c
…
hplance.c
…
hplance.h
…
hydra.c
hydra: Fix regression caused during net_device_ops conversion
2011-05-12 16:59:57 -04:00
ibmlana.c
net: fix section mismatches
2011-04-18 22:59:04 -07:00
ibmlana.h
…
ibmveth.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
ibmveth.h
…
ifb.c
net: call dev_alloc_name from register_netdevice
2011-05-05 10:57:45 -07:00
ioc3-eth.c
net: ioc3: convert to hw_features
2011-04-12 14:50:45 -07:00
ipg.c
…
ipg.h
…
iseries_veth.c
…
jazzsonic.c
…
jme.c
ethtool: Use full 32 bit speed range in ethtool's set_settings
2011-04-29 14:03:00 -07:00
jme.h
…
Kconfig
MIPS: Lantiq: Add ethernet driver
2011-05-19 09:55:43 +01:00
korina.c
…
ks8842.c
…
ks8851_mll.c
…
ks8851.c
…
ks8851.h
…
ksz884x.c
ethtool: Use full 32 bit speed range in ethtool's set_settings
2011-04-29 14:03:00 -07:00
lance.c
…
lantiq_etop.c
MIPS: Lantiq: Add ethernet driver
2011-05-19 09:55:43 +01:00
lasi_82596.c
…
lib8390.c
…
lib82596.c
…
LICENSE.SRC
…
ll_temac_main.c
…
ll_temac_mdio.c
…
ll_temac.h
…
lne390.c
…
loopback.c
net: Allow ethtool to set interface in loopback mode.
2011-05-08 15:59:12 -07:00
lp486e.c
…
mac89x0.c
…
mac8390.c
…
macb.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
macb.h
…
mace.c
…
mace.h
…
macmace.c
…
macsonic.c
…
macvlan.c
macvlan: Forward unicast frames in bridge mode to lowerdev
2011-05-22 21:01:18 -04:00
macvtap.c
…
Makefile
MIPS: Lantiq: Add ethernet driver
2011-05-19 09:55:43 +01:00
mdio.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
meth.c
…
meth.h
…
mii.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2011-05-05 14:59:02 -07:00
mipsnet.c
…
mv643xx_eth.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
mvme147.c
…
myri_sbus.c
…
myri_sbus.h
…
natsemi.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
ne2.c
…
ne2k-pci.c
…
ne3210.c
net: fix section mismatches
2011-04-18 22:59:04 -07:00
ne-h8300.c
ne-h8300: Fix regression caused during net_device_ops conversion
2011-05-12 16:59:57 -04:00
ne.c
…
netconsole.c
net: rename NETDEV_BONDING_DESLAVE to NETDEV_RELEASE
2011-05-22 21:01:19 -04:00
netx-eth.c
…
ni52.c
…
ni52.h
…
ni65.c
…
ni65.h
…
ni5010.c
…
ni5010.h
…
niu.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
niu.h
niu: convert to new ethtool set_phys_id
2011-04-06 14:35:23 -07:00
ns83820.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
pasemi_mac_ethtool.c
…
pasemi_mac.c
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
pasemi_mac.h
…
pci-skeleton.c
…
pcnet32.c
ethtool: Call ethtool's get/set_settings callbacks with cleaned data
2011-04-29 14:01:30 -07:00
plip.c
…
ppp_async.c
tty: make receive_buf() return the amout of bytes received
2011-04-22 17:31:53 -07:00
ppp_deflate.c
…
ppp_generic.c
…
ppp_mppe.c
…
ppp_mppe.h
…
ppp_synctty.c
tty: make receive_buf() return the amout of bytes received
2011-04-22 17:31:53 -07:00
pppoe.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2011-04-11 07:27:24 -07:00
pppox.c
…
pptp.c
pptp: Use flowi4's daddr/saddr in pptp_xmit().
2011-05-03 20:41:42 -07:00
ps3_gelic_net.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
ps3_gelic_net.h
net: ps3_gelic: convert to hw_features
2011-04-12 14:50:43 -07:00
ps3_gelic_wireless.c
net: ps3_gelic: convert to hw_features
2011-04-12 14:50:43 -07:00
ps3_gelic_wireless.h
…
pxa168_eth.c
…
qla3xxx.c
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
qla3xxx.h
…
r6040.c
…
r8169.c
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
rionet.c
rionet: Remove pointless printk of skb pointer.
2011-05-22 20:35:54 -04:00
rrunner.c
…
rrunner.h
…
s2io-regs.h
…
s2io.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
s2io.h
s2io: Fix warnings due to -Wunused-but-set-variable.
2011-04-12 11:21:30 -07:00
s6gmac.c
…
sb1000.c
…
sb1250-mac.c
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
sc92031.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
seeq8005.c
…
seeq8005.h
…
sgiseeq.c
Merge branch 'master' into for-next
2011-04-26 10:22:59 +02:00
sgiseeq.h
update David Miller's old email address
2011-04-06 06:19:38 -07:00
sh_eth.c
…
sh_eth.h
…
sis190.c
…
sis900.c
net/sis900: store MAC into perm_addr for SiS 900, 630E, 635 and 96x variants
2011-04-12 14:56:00 -07:00
sis900.h
…
skge.c
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
skge.h
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2011-04-11 13:44:25 -07:00
sky2.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
sky2.h
net: sky2: convert to hw_features
2011-04-12 14:50:42 -07:00
slhc.c
…
slip.c
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2011-05-23 12:23:20 -07:00
slip.h
…
smc91x.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
smc91x.h
…
smc911x.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
smc911x.h
…
smc9194.c
…
smc9194.h
…
smc-mca.c
net: fix section mismatches
2011-04-18 22:59:04 -07:00
smc-ultra32.c
…
smc-ultra.c
…
smsc911x.c
net: allow shifted access in smsc911x V2
2011-04-13 17:13:00 -07:00
smsc911x.h
…
smsc9420.c
…
smsc9420.h
…
sni_82596.c
…
sonic.c
…
sonic.h
…
Space.c
…
spider_net_ethtool.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
spider_net.c
net: spider_net: convert to hw_features
2011-04-15 15:50:39 -07:00
spider_net.h
net: spider_net: convert to hw_features
2011-04-15 15:50:39 -07:00
starfire.c
…
stnic.c
…
sun3_82586.c
…
sun3_82586.h
…
sun3lance.c
…
sunbmac.c
…
sunbmac.h
…
sundance.c
…
sungem_phy.c
…
sungem_phy.h
…
sungem.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
sungem.h
…
sunhme.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2011-05-20 13:43:21 -07:00
sunhme.h
…
sunlance.c
…
sunqe.c
…
sunqe.h
…
sunvnet.c
…
sunvnet.h
…
tc35815.c
Add appropriate <linux/prefetch.h> include for prefetch users
2011-05-22 21:41:57 -07:00
tehuti.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
tehuti.h
…
tg3.c
tg3: Add braces around 5906 workaround.
2011-05-20 00:33:19 -04:00
tg3.h
tg3: Fix stats for 5704 and later devices
2011-05-19 18:00:00 -04:00
tlan.c
…
tlan.h
…
tsi108_eth.c
…
tsi108_eth.h
…
tun.c
net: call dev_alloc_name from register_netdevice
2011-05-05 10:57:45 -07:00
typhoon.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
typhoon.h
…
ucc_geth_ethtool.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-05-23 09:12:26 -07:00
ucc_geth.c
…
ucc_geth.h
…
veth.c
net: drivers: kill two unused macro definitions
2011-05-15 18:01:15 -04:00
via-rhine.c
via-rhine: Assign random MAC address if necessary
2011-04-17 17:56:37 -07:00
via-velocity.c
ethtool: cosmetic: Use ethtool ethtool_cmd_speed API
2011-04-29 14:03:01 -07:00
via-velocity.h
…
virtio_net.c
…
wd.c
…
xen-netfront.c
…
xilinx_emaclite.c
…
xtsonic.c
…
yellowfin.c
…
znet.c
…
zorro8390.c
zorro8390: Fix regression caused during net_device_ops conversion
2011-05-12 16:59:57 -04:00