1
0
Fork 0
alistair23-linux/drivers/net/appletalk
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
..
Kconfig Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
Makefile
cops.c drivers/net: Remove unnecessary returns from void function()s 2010-05-14 00:19:28 -07:00
cops.h [APPLETALK]: warning fix 2006-02-13 15:53:41 -08:00
cops_ffdrv.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
cops_ltdrv.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ipddp.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
ipddp.h drivers/net/appletalk: endianness 2007-10-10 16:52:05 -07:00
ltpc.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
ltpc.h