linux/arch/m68k/mac
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
..
baboon.c m68k: mac core - Kill warn_unused_result warnings 2009-01-12 20:56:37 +01:00
config.c m68k/mac: Add color classic ii support 2010-08-09 21:14:07 +02:00
iop.c m68k: mac core - Kill warn_unused_result warnings 2009-01-12 20:56:37 +01:00
mac_penguin.S Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
macboing.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
macints.c mac68k: replace mac68k SCC code with platform device 2010-02-27 18:31:09 +01:00
Makefile mac68k: replace mac68k SCC code with platform device 2010-02-27 18:31:09 +01:00
misc.c m68k/mac: Fix RTC on PMU machines 2010-08-09 21:14:08 +02:00
oss.c mac68k: replace mac68k SCC code with platform device 2010-02-27 18:31:09 +01:00
psc.c m68k: mac core - Kill warn_unused_result warnings 2009-01-12 20:56:37 +01:00
via.c mac68k: replace mac68k SCC code with platform device 2010-02-27 18:31:09 +01:00