From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 17 Feb 2014 20:40:36 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt... 
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=2b250395c256837034dd509fb336f9d30bea0cb9;p=~andy%2Flinux

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
---

2b250395c256837034dd509fb336f9d30bea0cb9