Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Oct 2007 02:22:56 +0000 (19:22 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Oct 2007 02:22:56 +0000 (19:22 -0700)
commit5f48b338cd28f4095697a174d7e3e72084aca893
tree3e425801e8da2ffdfd6a88c3f494032bc512a5fa
parentf09cc910fe3af7e63298105bc0482653eb534c3c
parent29f139ce27c7e64a3e8575afa8deb46cde09db0a
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.