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

..

b43.h

b43: rename TMS defines, drop useless condition from core reset

2010-12-13 15:23:29 -05:00

debugfs.c

net/wireless: use generic_file_llseek in debugfs

2010-09-16 10:33:08 +02:00

debugfs.h

b43: Add optional verbose runtime statistics

2009-09-23 11:35:44 -04:00

dma.c

b43: remove extraneous code in free_ringmemory

2010-11-15 13:24:38 -05:00

dma.h

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00

Kconfig

b43: rename config option for N-PHY, drop BROKEN

2010-12-08 15:38:45 -05:00

leds.c

b43: fix two warnings

2009-12-04 14:16:25 -05:00

leds.h

b43: add 'struct b43_wl' missing declaration

2009-10-27 16:29:46 -04:00

lo.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

lo.h

b43: Implement dynamic PHY API

2008-08-29 16:24:12 -04:00

main.c

b43: N-PHY: enable support for PHYs rev 3 and higher

2010-12-22 15:43:30 -05:00

main.h

b43: remove SHM spinlock

2009-09-08 16:31:08 -04:00

Makefile

b43: rename config option for N-PHY, drop BROKEN

2010-12-08 15:38:45 -05:00

pcmcia.c

pcmcia: move driver name to struct pcmcia_driver

2010-09-29 17:20:24 +02:00

pcmcia.h

[B43]: add mac80211-based driver for modern BCM43xx devices

2007-10-10 16:51:37 -07:00

phy_a.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

phy_a.h

b43: Split PHY alloc and init

2008-09-05 16:17:49 -04:00

phy_common.c

b43: rename config option for N-PHY, drop BROKEN

2010-12-08 15:38:45 -05:00

phy_common.h

b43: set TMS to work with current band width for N-PHY

2010-12-08 15:38:45 -05:00

phy_g.c

tree-wide: fix comment/printk typos

2010-11-01 15:38:34 -04:00

phy_g.h

b43: Use a threaded IRQ handler

2009-09-08 16:31:06 -04:00

phy_lp.c

b43: silence most sparse warnings

2010-07-21 14:37:38 -04:00

phy_lp.h

b43: LP-PHY: Begin implementing calibration & software RFKILL support

2009-10-30 16:49:18 -04:00

phy_n.c

b43: N-PHY: update 2056 radio on channel switch on rev3+

2010-12-22 15:43:29 -05:00

phy_n.h

b43: N-PHY: implement very basic TX power control management

2010-12-02 14:37:01 -05:00

pio.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

pio.h

b43: remove get_tx_stats() mac80211 op

2010-02-08 16:51:00 -05:00

radio_2055.c

b43: N-PHY: swap values for radio registers 0x3b and 0x3c

2010-12-02 14:37:01 -05:00

radio_2055.h

b43: N-PHY: put radio-specific code in separated file

2010-10-15 15:57:38 -04:00

radio_2056.c

b43: N-PHY: use correct channel tables for rev4+

2010-12-22 15:43:29 -05:00

radio_2056.h

b43: N-PHY: implement radio 2056 init steps

2010-12-22 15:43:29 -05:00

rfkill.c

b43: rfkill: use HI enabled bit for all devices

2010-11-22 15:48:50 -05:00

rfkill.h

b43/legacy: port to cfg80211 rfkill

2009-06-10 13:27:54 -04:00

sdio.c

wireless: b43: fix error path in SDIO

2010-11-23 15:00:51 -05:00

sdio.h

b43: Add Soft-MAC SDIO device support

2009-09-23 11:35:43 -04:00

sysfs.c

b43: Use a threaded IRQ handler

2009-09-08 16:31:06 -04:00

sysfs.h

[B43]: add mac80211-based driver for modern BCM43xx devices

2007-10-10 16:51:37 -07:00

tables_lpphy.c

b43: LP-PHY: Fix TX gain tables

2009-08-31 14:42:13 -04:00

tables_lpphy.h

b43: LP-PHY: Refactor TX gain table I/O

2009-08-14 09:14:04 -04:00

tables_nphy.c

b43: N-PHY: one more fix for order of tables initialization

2010-12-13 15:23:29 -05:00

tables_nphy.h

b43: N-PHY: put 2056-radio's specific code in separated file

2010-10-15 15:57:40 -04:00

tables.c

b43: Implement dynamic PHY API

2008-08-29 16:24:12 -04:00

tables.h

b43: rewrite A PHY initialization

2008-01-28 15:04:31 -08:00

wa.c

b43: silence most sparse warnings

2010-07-21 14:37:38 -04:00

wa.h

b43: rewrite A PHY initialization

2008-01-28 15:04:31 -08:00

xmit.c

b43: remove usage of deprecated noise value

2010-04-28 16:48:21 -04:00

xmit.h

drivers/net: use __packed annotation

2010-06-03 03:18:23 -07:00