Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Jun 2009 15:48:42 +0000 (08:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Jun 2009 15:48:42 +0000 (08:48 -0700)
commit7e0d8a838834beb2cce9df48dacf67f4e8e699cb
treee8cd79cd3c6297933cf768c4b596331a121e93fc
parent987fed3bf6982f2627d4fa242caa9026ef61132a
parent8944146daa2c38dd85bc489d1b84fb9abc108837
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc32: Fix makefile not generating required files
  sparc32: Fix tftpboot.img Makefile
  sparc: fix tftpboot.img build
  sparc32: Fix obvious build issues for tftpboot.img build.
  sparc64: Fix build warnings in piggyback_64.c
  sparc64: Don't use alloc_bootmem() in init_IRQ() code paths.