OpenCloudOS-Kernel/drivers/atm
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
.gitignore [ATM]: Ignore generated file pca200e_ecd.bin2 2006-12-11 14:34:35 -08:00
Kconfig Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
Makefile Drivers: atm: Makefile: replace the use of <module>-objs with <module>-y 2010-10-21 03:09:48 -07:00
adummy.c atm/adummy: add syfs DEVICE_ATTR to change signal 2010-07-09 00:09:21 -07:00
ambassador.c atm: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used) 2010-07-15 19:05:18 -07:00
ambassador.h firmware: convert Ambassador ATM driver to request_firmware() 2008-07-10 14:49:39 +01:00
atmtcp.c net: sk_sleep() helper 2010-04-20 16:37:13 -07:00
eni.c atm: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used) 2010-07-15 19:05:18 -07:00
eni.h drivers/atm/eni.h: remove unused macro KERNEL_OFFSET 2008-06-10 12:46:52 -07:00
firestream.c drivers/atm/firestream.c: Fix unsigned return type 2010-09-06 18:48:42 -07:00
firestream.h
fore200e.c of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
fore200e.h fore200e: Convert over to pure OF driver. 2008-08-29 02:14:59 -07:00
he.c atm: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used) 2010-07-15 19:05:19 -07:00
he.h atm: [he] rewrite buffer handling in receive path 2010-05-31 00:27:47 -07:00
horizon.c drivers: atm: use native kernel's hex_to_bin() func 2010-09-21 18:04:44 -07:00
horizon.h long vs. unsigned long - low-hanging fruits in drivers 2007-10-14 12:41:51 -07:00
idt77105.c atm/idt77105.c: call atm_dev_signal_change() when signal changes. 2010-07-09 00:09:22 -07:00
idt77105.h [ATM]: [idt77105] should be __devinit not __init 2006-06-29 16:58:12 -07:00
idt77252.c drivers/atm/idt77252.c: Remove unnecessary error check 2010-10-03 22:06:11 -07:00
idt77252.h atm: idt77252: Use generic SKB queue management instead of home-grown scheme. 2008-09-21 21:38:26 -07:00
idt77252_tables.h
iphase.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-10-11 12:30:34 -07:00
iphase.h ATM: iphase, remove sleep-inside-atomic 2010-10-11 11:05:42 -07:00
lanai.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
midway.h
nicstar.c drivers: atm: don't use private copy of hex_to_bin() 2010-07-23 12:50:49 -07:00
nicstar.h atm: [nicstar] remove virt_to_bus() and support 64-bit platforms 2010-05-31 00:27:46 -07:00
nicstarmac.c atm: [nicstar] reformatted with Lindent 2010-05-31 00:27:46 -07:00
nicstarmac.copyright drivers/atm/: remove CVS keywords 2008-05-20 14:52:25 -07:00
solos-attrlist.c solos: Show Interleaving details for ADSL2 and 2+ 2009-05-07 19:49:44 +01:00
solos-pci.c ATM: solos-pci, remove use after free 2010-10-11 11:05:41 -07:00
suni.c atm/suni.c: call atm_dev_signal_change() when signal changes. 2010-07-09 00:09:23 -07:00
suni.h atm: [suni] add support for setting loopback and framing modes 2008-06-17 16:19:24 -07:00
tonga.h
uPD98401.h
uPD98402.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
uPD98402.h
zatm.c atm: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used) 2010-07-15 19:05:21 -07:00
zatm.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
zeprom.h