diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-10-02 21:47:02 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-10-02 21:47:02 +0100 |
commit | d5d16892243e7755da706d03b34da85ea6a74117 (patch) | |
tree | 35923f150cf6d9130abda2ef6b65a9719ad38155 /arch/powerpc/kvm/booke.h | |
parent | 3467e765a59241f8b0e488f4a6ef183547181f35 (diff) | |
parent | ad684dce87fac52738649e62b4afa25081b52a28 (diff) | |
parent | f3354ab67476dc800463df32e33423158003d80b (diff) | |
parent | 421520ba98290a73b35b7644e877a48f18e06004 (diff) | |
download | blackbird-obmc-linux-d5d16892243e7755da706d03b34da85ea6a74117.tar.gz blackbird-obmc-linux-d5d16892243e7755da706d03b34da85ea6a74117.zip |
Merge branches 'fiq' (early part), 'fixes', 'l2c' (early part) and 'misc' into for-next