Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jul 2015 19:17:55 +0000 (12:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jul 2015 19:17:55 +0000 (12:17 -0700)
commitd7f430d450d333cbb404e232fb1c74f31f8c6356
treedf13925775aeb0b7f172086446a494fda7eadd26
parent52721d9d3334c1cb1f76219a161084094ec634dc
parent09adcdf212d777ace8bb31bed8ca5c1dbd56bd0f
Merge branch 'for-linus' of git://git./linux/kernel/git/egtvedt/linux-avr32

Pull AVR32 update from Hans-Christian Egtvedt.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
  AVR32/time: Migrate to new 'set-state' interface