From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Jun 2009 15:48:42 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7e0d8a838834beb2cce9df48dacf67f4e8e699cb;p=openwrt%2Fstaging%2Fblogic.git

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.
---

7e0d8a838834beb2cce9df48dacf67f4e8e699cb