Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt...

Pull AVR32 update from Hans-Christian Egtvedt:
 "wow, it has gone 10 releases since my last request :("

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
  avr32: fix building warnings caused by redefinitions of HZ
  avr32: fix relocation check for signed 18-bit offset
  avr32: move NODES_SHIFT into Kconfig and delete numnodes.h

diff --combined arch/avr32/Kconfig
index bdc3558,ba4d405..549903c
--- 1/arch/avr32/Kconfig
--- 2/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@@ -26,6 -26,9 +26,6 @@@ config AVR3
          There is an AVR32 Linux project with a web page at
          http://avr32linux.org/.
  
 -config GENERIC_GPIO
 -      def_bool y
 -
  config STACKTRACE_SUPPORT
        def_bool y
  
@@@ -205,6 -208,11 +205,11 @@@ config ARCH_DISCONTIGMEM_ENABL
  config ARCH_SPARSEMEM_ENABLE
        def_bool n
  
+ config NODES_SHIFT
+       int
+       default "2"
+       depends on NEED_MULTIPLE_NODES
+ 
  source "mm/Kconfig"
  
  config OWNERSHIP_TRACE