forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
linux-pinenote/drivers/net/wireless/ath/ath5k
History
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
..
ani.c ath5k: use the common cycle counter / listen time implementation 2010-10-11 15:04:20 -04:00
ani.h ath5k: use the common cycle counter / listen time implementation 2010-10-11 15:04:20 -04:00
ath5k.h Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
attach.c ath5k: Remove unused variable for atim window 2010-09-28 15:47:57 -04:00
base.c ath5k: Move debugfs under ieee80211/[wiphy-name] 2010-10-13 15:45:21 -04:00
base.h ath5k: Print rx/tx bytes in debugfs 2010-10-05 13:35:25 -04:00
caps.c ath5k: remove ATH_TRACE macro 2010-06-02 16:13:24 -04:00
debug.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-10-23 11:47:02 -07:00
debug.h ath5k: Move debugfs under ieee80211/[wiphy-name] 2010-10-13 15:45:21 -04:00
desc.c ath5k: report PHY error frames only for chips which need it 2010-06-16 14:59:07 -04:00
desc.h ath5k: take descriptor differences between 5210 and 5211 into account 2010-06-16 14:59:06 -04:00
dma.c ath5k: Fix bitmasks and typos for PCU Diagnostic register 2010-09-28 15:47:57 -04:00
eeprom.c ath5k: clean up some comments 2010-08-24 16:28:00 -04:00
eeprom.h
gpio.c ath5k: remove ATH_TRACE macro 2010-06-02 16:13:24 -04:00
initvals.c
Kconfig
led.c
Makefile ath5k: add sysfs files for ANI parameters 2010-06-02 16:13:26 -04:00
pcu.c ath5k: store the clock rate in common data on channel changes 2010-10-11 15:04:20 -04:00
phy.c ath5k: store the clock rate in common data on channel changes 2010-10-11 15:04:20 -04:00
qcu.c ath5k: Simplify cw_min/max and AIFS configuration 2010-09-21 11:05:16 -04:00
reg.h Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
reset.c ath5k: Allow ath5k to support virtual STA and AP interfaces. 2010-10-05 13:35:23 -04:00
rfbuffer.h ath5k: clean up some comments 2010-08-24 16:28:00 -04:00
rfgain.h
rfkill.c
sysfs.c ath5k: add sysfs files for ANI parameters 2010-06-02 16:13:26 -04:00