pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff

author	Linus Torvalds <torvalds@woody.linux-foundation.org>
	Tue, 24 Jul 2007 23:00:26 +0000 (16:00 -0700)
committer	Linus Torvalds <torvalds@woody.linux-foundation.org>
	Tue, 24 Jul 2007 23:00:26 +0000 (16:00 -0700)

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix marge error due to conflict in arch/mips/kernel/head.S
  [MIPS] ARC: Remove unused arch/mips/arc/console.c
  [MIPS] SNI: sniprom
  [MIPS] Jazz: remove unneeded reset functions
  [MIPS] Whitespace cleanup.
  [MIPS] Make resources for ds1742 "static __initdata"
  [MIPS] Replace __attribute_used__ with __used
  [MIPS] Jazz: Remove unused arch/mips/jazz/io.c
  [MIPS] Mark prom_free_prom_memory as __init_refok
  [MIPS] MIPSsim: Fix cflags

Trivial merge