tree 951e204487494557ca0f231e7fd8457bc58dddd2
parent 3cb7a59fd8c816af6765f3712cd233d83984edf2
parent 0c9b5a317b8ae7201fed07ec66d642b2ad7ea1b0
author Linus Torvalds <torvalds@linux-foundation.org> 1369271217 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1369271217 -0700

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

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