leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2a543904dd
linux/drivers/infiniband/hw/cxgb3
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
..
cxio_dbg.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
cxio_hal.c RDMA/cxgb3,cxgb4: Remove dead code 2011-01-10 17:41:43 -08:00
cxio_hal.h RDMA/cxgb3: Don't exceed the max HW CQ depth 2010-09-02 14:52:21 -07:00
cxio_resource.c kfifo: fix warn_unused_result 2009-12-22 14:17:56 -08:00
cxio_resource.h
cxio_wr.h tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
iwch_cm.c RDMA/cxgb3: Remove unnecessary KERN_<level> use 2010-10-26 13:45:49 -07:00
iwch_cm.h RDMA/cxgb3: Don't free endpoints early 2009-09-05 20:22:38 -07:00
iwch_cq.c RDMA/cxgb3: MEM_MGT_EXTENSIONS support 2008-07-14 23:48:45 -07:00
iwch_ev.c RDMA/cxgb3: When a user QP is marked in error, also mark the CQs in error 2010-10-22 22:00:53 -07:00
iwch_mem.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
iwch_provider.c RDMA/cxgb3: When a user QP is marked in error, also mark the CQs in error 2010-10-22 22:00:53 -07:00
iwch_provider.h RDMA/cxgb3,cxgb4: Remove dead code 2011-01-10 17:41:43 -08:00
iwch_qp.c RDMA/cxgb3,cxgb4: Remove dead code 2011-01-10 17:41:43 -08:00
iwch_user.h RDMA/cxgb3: When a user QP is marked in error, also mark the CQs in error 2010-10-22 22:00:53 -07:00
iwch.c RDMA/cxgb3: Shrink .text with compile-time init of handlers arrays 2010-04-28 14:57:40 -07:00
iwch.h RDMA/cxgb3: Doorbell overflow avoidance and recovery 2010-02-24 10:40:28 -08:00
Kconfig Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
Makefile IB: Replace EXTRA_CFLAGS with ccflags-y 2010-10-23 13:45:03 -07:00
tcb.h