diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-10 12:58:24 +1000 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-05-10 12:58:24 +1000 |
commit | b48d441a8ab8a89bd32a3a981a05b8a26905dfc7 (patch) | |
tree | 09faed1b557b70f439064d3baaefef91e0ee7334 /arch/m68k/platform/coldfire/device.c | |
parent | a7243c1d09ade57d8d48a350753dc2d1af735805 (diff) | |
parent | dce4c92d69db53ed0e09191428f17ac9a14ad248 (diff) | |
download | talos-obmc-linux-b48d441a8ab8a89bd32a3a981a05b8a26905dfc7.tar.gz talos-obmc-linux-b48d441a8ab8a89bd32a3a981a05b8a26905dfc7.zip |
Merge remote-tracking branch 'jwb/next' into next
Josh writes:
<<
A few patches from Suzie for 47x kexec/kdump support, and some MSI patches
from Mai La.
>>
Diffstat (limited to 'arch/m68k/platform/coldfire/device.c')
0 files changed, 0 insertions, 0 deletions