android_kernel_xiaomi_sm8350/drivers/net/hamradio
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
..
6pack.c hamradio: 6pack: semaphore cleanup 2010-10-12 17:36:08 +02:00
baycom_epp.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-18 22:19:03 -08:00
baycom_par.c
baycom_ser_fdx.c net/various: remove trailing space in messages 2010-03-24 14:10:38 -07:00
baycom_ser_hdx.c headers: remove sched.h from interrupt.h 2009-10-11 11:20:58 -07:00
bpqether.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
dmascc.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
hdlcdrv.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
Kconfig Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
Makefile
mkiss.c hamradio: Mkiss: semaphore cleanup 2010-10-12 17:36:09 +02:00
scc.c drivers/net/hamradio: Adjust confusing if indentation 2010-08-16 21:06:29 -07:00
yam.c drivers/net/hamradio: Eliminate a NULL pointer dereference 2010-05-28 01:57:18 -07:00
z8530.h