kevin/linux
1
Fork 0
Code
bf2106ae11
linux/arch/blackfin
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
..
boot Blackfin: add support for LZO compressed kernels 2010-08-06 12:55:53 -04:00
configs Blackfin: tll6527m: new board port 2010-10-22 16:29:58 -04:00
include/asm Blackfin: bfin_spi.h: add MMR peripheral layout 2010-10-22 16:30:03 -04:00
kernel Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin 2010-10-22 21:12:27 -07:00
lib Blackfin: optimize strncpy a bit 2010-05-22 14:19:11 -04:00
mach-bf518 Blackfin: bf518-ezkit: add ssm2603 codec resources 2010-10-22 16:29:59 -04:00
mach-bf527 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
mach-bf533 Blackfin: H8606: move 8250 irqflags to platform resources 2010-10-22 16:30:01 -04:00
mach-bf537 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
mach-bf538 Blackfin: bf538: add missing SIC_RVECT define 2010-10-22 16:30:02 -04:00
mach-bf548 Blackfin: bf54x: add missing SIC_RVECT definition 2010-10-22 16:30:01 -04:00
mach-bf561 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin 2010-10-22 21:12:27 -07:00
mach-common Blackfin: bf561: rewrite SICA_xxx to just SIC_xxx 2010-10-22 16:30:02 -04:00
mm Blackfin: merge kernel init memory back into main memory region 2010-10-22 04:02:01 -04:00
oprofile
ADI_BSD.txt Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
Kconfig Blackfin: glue XIP/ROM kernel kconfigs 2010-10-22 16:30:00 -04:00
Kconfig.debug Blackfin: allow NMI watchdog to be used w/RETN as a scratch reg 2010-05-22 14:19:04 -04:00
Makefile Blackfin: update sparse flags for latest upstream changes 2010-10-22 16:30:00 -04:00