q3k
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux/arch/m68k
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
..
amiga m68k: amiga - RTC platform device conversion 2010-05-26 19:51:10 +02:00
apollo m68k: apollo core - Kill warn_unused_result warnings 2009-01-12 20:56:35 +01:00
atari tree-wide: Assorted spelling fixes 2010-02-09 11:13:56 +01:00
bvme6000 llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
configs defconfig reduction 2010-08-14 22:26:53 +02:00
fpsp040 m68k: fix trigraph ignored warning in setox.S 2008-12-28 20:00:05 +01:00
hp300 m68k: hp300 - Checkpatch cleanup 2010-05-17 21:15:40 +02:00
ifpsp060 tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
include/asm Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 2010-10-22 17:33:35 -07:00
kernel m68k: Remove big kernel lock in cache flush code 2010-10-22 09:43:25 +02:00
lib Stringify support commas 2008-07-20 17:24:38 -07:00
mac Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
math-emu locking, m68k/asm-offsets: Rename signal defines 2009-09-01 09:38:03 +02:00
mm m68k: invoke oom-killer from page fault 2010-05-17 21:37:39 +02:00
mvme16x llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
mvme147 m68k: mvme147 core - Kill warn_unused_result warnings 2009-01-12 20:56:37 +01:00
q40 Update broken web addresses in arch directory. 2010-10-18 11:03:21 +02:00
sun3 m68k/m68knommu: Remove dead SMP config option 2010-10-22 09:43:23 +02:00
sun3x 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
tools/amiga Convert files to UTF-8 and some cleanups 2007-10-19 23:21:04 +02:00
Kconfig m68k: Remove dead GG2 config option 2010-10-22 09:43:22 +02:00
Kconfig.debug
…
Makefile kbuild: allow assignment to {A,C,LD}FLAGS_MODULE on the command line 2010-08-03 14:09:45 +02:00
install.sh kbuild: use INSTALLKERNEL to select customized installkernel script 2009-09-20 12:18:14 +02:00