diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-02 20:30:36 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-02 20:30:36 (GMT) |
commit | 946342d03ec4e8367bba7bb99e7155e97f69058a (patch) | |
tree | bf61b17951f3696c3cde69624fcccdc05370e8aa /Documentation/aoe | |
parent | 70100a02268423b7bceafdf0ed6b0245f9baf7e8 (diff) | |
parent | f8f02ec25ce3eafb049feeb3abf34fcd6e338241 (diff) | |
parent | 1783d4574619aea9ff5d94e6506f288547fc6737 (diff) | |
parent | 848a7b13aef0d8d611b6461b6cc250319fc1dbe1 (diff) | |
parent | 6aaa189f8712471a250bfdf8fc8d08277258b8ab (diff) | |
parent | 5e45a0a1975df83fc068349e6a31fdf6af61a458 (diff) | |
download | linux-fsl-qoriq-946342d03ec4e8367bba7bb99e7155e97f69058a.tar.xz |
Merge branches 'devel-stable', 'entry', 'fixes', 'mach-types', 'misc' and 'smp-hotplug' into for-linus