Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt...
commit785eb10b9f1cf1a1b9e3bb5175da04dc0ffba553
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Jan 2011 20:32:05 +0000 (28 06:32 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Jan 2011 20:32:05 +0000 (28 06:32 +1000)
tree3085fd015d9e3b0a504a729e049a6a9f1ca500d8
parent6fb1b304255efc5c4c93874ac8c066272e257e28
parent6cb8e872c800be55496a56d1e1a6aafba8fa936d
Merge branch 'for-linus' of git://git./linux/kernel/git/egtvedt/avr32-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6:
  avr32: add missing include causing undefined pgtable_page_* references