android_kernel_samsung_msm8976/drivers/atm
Linus Torvalds 008d23e485 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: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
2011-01-13 10:05:56 -08:00
..
.gitignore
adummy.c atm: correct sysfs 'device' link creation and parent relationships 2010-12-10 15:45:05 -08:00
ambassador.c Madge Ambassador ATM Adapter driver: Always release_firmware() in ucode_init() and don't leak memory. 2011-01-09 15:45:48 -08:00
ambassador.h
atmtcp.c drivers/atm/atmtcp.c: add missing atm_dev_put 2010-12-31 12:52:05 -08:00
eni.c atm: correct sysfs 'device' link creation and parent relationships 2010-12-10 15:45:05 -08:00
eni.h
firestream.c atm: correct sysfs 'device' link creation and parent relationships 2010-12-10 15:45:05 -08:00
firestream.h
fore200e.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-12-17 12:27:22 -08:00
fore200e.h
he.c atm: correct sysfs 'device' link creation and parent relationships 2010-12-10 15:45:05 -08:00
he.h
horizon.c atm: correct sysfs 'device' link creation and parent relationships 2010-12-10 15:45:05 -08:00
horizon.h
idt77105.c
idt77105.h
idt77252.c atm: correct sysfs 'device' link creation and parent relationships 2010-12-10 15:45:05 -08:00
idt77252.h tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
idt77252_tables.h
iphase.c Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
iphase.h ATM: iphase, remove sleep-inside-atomic 2010-10-11 11:05:42 -07:00
Kconfig Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
lanai.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-12-17 12:27:22 -08:00
Makefile Drivers: atm: Makefile: replace the use of <module>-objs with <module>-y 2010-10-21 03:09:48 -07:00
midway.h
nicstar.c atm: correct sysfs 'device' link creation and parent relationships 2010-12-10 15:45:05 -08:00
nicstar.h
nicstarmac.c
nicstarmac.copyright
solos-attrlist.c solos: Add 'Firmware' attribute for Traverse overall firmware version 2010-11-08 12:17:04 -08:00
solos-pci.c atm: correct sysfs 'device' link creation and parent relationships 2010-12-10 15:45:05 -08:00
suni.c
suni.h
tonga.h
uPD98401.h
uPD98402.c
uPD98402.h
zatm.c atm: correct sysfs 'device' link creation and parent relationships 2010-12-10 15:45:05 -08:00
zatm.h
zeprom.h