q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/drivers/s390/net
History
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
..
claw.c [S390] claw: add support for irq statistics 2011-01-05 12:47:26 +01:00
claw.h claw: rename READ/WRITE defines to avoid redefinitions 2010-08-12 16:04:22 -07:00
ctcm_dbug.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
ctcm_dbug.h
ctcm_fsms.c ctcm: rename READ/WRITE defines to avoid redefinitions 2010-08-12 16:04:23 -07:00
ctcm_fsms.h s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
ctcm_main.c [S390] ctc: add support for irq statistics 2011-01-05 12:47:26 +01:00
ctcm_main.h ctcm: rename READ/WRITE defines to avoid redefinitions 2010-08-12 16:04:23 -07:00
ctcm_mpc.c s390: ctcm_mpc: Fix build after netdev refcount changes. 2010-10-13 09:11:26 -07:00
ctcm_mpc.h
ctcm_sysfs.c ctcm: rename READ/WRITE defines to avoid redefinitions 2010-08-12 16:04:23 -07:00
fsm.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
fsm.h ctcm: suspend has to wait for outstanding I/O 2009-11-13 20:46:59 -08:00
Kconfig [S390] cleanup s390 Kconfig 2011-01-05 12:47:23 +01:00
lcs.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
lcs.h s390: remove cu3088 layer for lcs and ctcm 2009-11-13 20:47:00 -08:00
Makefile [S390] smsgiucv_app: deliver z/VM CP special messages (SMSG) as uevents 2010-03-08 12:26:28 +01:00
netiucv.c const: constify remaining dev_pm_ops 2009-12-15 08:53:25 -08:00
qeth_core.h qeth: remove dev_queue_xmit invocation 2010-11-08 12:17:08 -08:00
qeth_core_main.c [S390] qeth: buffer count imbalance 2011-01-05 12:47:29 +01:00
qeth_core_mpc.c
qeth_core_mpc.h qeth: support ipv6 query arp cache for HiperSockets 2010-12-10 14:28:47 -08:00
qeth_core_sys.c drivers/s390/net: Remove unnecessary semicolons 2010-11-28 18:13:17 -08:00
qeth_l2_main.c qeth: enable interface setup if LAN is offline 2010-11-28 18:13:17 -08:00
qeth_l3.h qeth: IP address takeover flag setting 2010-07-23 12:36:22 -07:00
qeth_l3_main.c qeth: l3 add vlan hdr in passthru frames 2010-12-10 14:28:48 -08:00
qeth_l3_sys.c qeth: IP address takeover flag setting 2010-07-23 12:36:22 -07:00
smsgiucv.c smsgiucv: guarantee single iucv connect in thaw 2010-06-23 13:16:32 -07:00
smsgiucv.h [S390] smsgiucv_app: deliver z/VM CP special messages (SMSG) as uevents 2010-03-08 12:26:28 +01:00
smsgiucv_app.c [S390] cmm, smsgiucv_app: convert sender to uppercase 2010-08-09 18:12:54 +02:00