From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 23 Oct 2007 02:22:56 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: firefly_0821_release~24677
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5f48b338cd28f4095697a174d7e3e72084aca893;p=firefly-linux-kernel-4.4.55.git

Merge branch 'master' of /linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: ARRAY_SIZE() cleanup
  [SPARC64]: small Makefile cleanups
  [SPARC64]: Stop using __do_IRQ().
  [SPARC64]: Update defconfig.
---

5f48b338cd28f4095697a174d7e3e72084aca893