Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Apr 2014 16:49:16 +0000 (09:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Apr 2014 16:49:16 +0000 (09:49 -0700)
commitf27a15d24670d143f2271a199202d72b6c4fe107
treecf40deb3dd5d2167e0377bedfa74bdc10fc85218
parent01d5f3b598b18a5035426c30801adf65822dbd0c
parent4c3b7df4ed541f934e7aad7a52aee12d44b9c2ff
Merge branch 'for-linus' of git://git./linux/kernel/git/egtvedt/linux-avr32

Pull AVR32 updates from Hans-Christian Egtvedt.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
  avr32: replace simple_strtoul() with kstrtoul()
  arch/avr32/mm/cache.c: export symbol flush_icache_range() for module using
  avr32: remove cpu_data macro to fix compiles