From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 Nov 2013 05:25:33 +0000 (+0900)
Subject: Merge tag 'metag-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan... 
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0993537bff42edfbea7649975196cd2552c4b936;p=pandora-kernel.git

Merge tag 'metag-for-v3.13' of git://git./linux/kernel/git/jhogan/metag

Pull metag architecture changes from James Hogan:
 - A change to remove the last dependence on bootloader exception
   handlers so that QEMU can more easily boot an SMP Linux/Meta kernel
   image directly.
 - A fix for a minor off by one error in a BUG_ON condition found by Dan
   Carpenter.

* tag 'metag-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
  metag: off by one in setup_bootmem_node()
  metag: handle low level kicks directly
---

0993537bff42edfbea7649975196cd2552c4b936
Reading git-diff-tree failed