Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Feb 2014 20:40:36 +0000 (12:40 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Feb 2014 20:40:36 +0000 (12:40 -0800)
commit2b250395c256837034dd509fb336f9d30bea0cb9
tree6c1d7e8abf968d9f340fdb3e2f64f04022d02b03
parentf2a77abdb8226b8dbad039d415d5d70a934ac605
parentd7668f9d448aa757971ec3e68ecedb5ebecbddcc
Merge branch 'for-linus' of git://git./linux/kernel/git/egtvedt/linux-avr32

Pull AVR32 fixes from Hans-Christian Egtvedt.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
  avr32: add generic vga.h to Kbuild
  avr32: add generic ioremap_wc() definition in io.h
  avr32: Makefile: add '-D__linux__' flag for gcc-4.4.7 use
  avr32: fix missing module.h causing build failure in mimc200/fram.c