diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-07-02 12:31:08 +0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-07-02 12:31:08 +0400 |
commit | 7a9cdd95fe153f86d23f63811ad4ba0ab32dad57 (patch) | |
tree | 4fdeea6571fbf10e59fd32cbcb9c977858791808 /fs/pstore/ftrace.c | |
parent | dd8164c1dd7f511aa362f548fd8c4882bee3fd54 (diff) | |
parent | dd0120dea601de654a5a6d959da3a632a02200f0 (diff) | |
download | linux-7a9cdd95fe153f86d23f63811ad4ba0ab32dad57.tar.xz |
Merge remote-tracking branch 'agust/next' into next
From Anatolij:
"There are small cleanups and fixes for mpc512x common code,
mpc512x_defconfig updates and soft reboot support for mpc5125
based boards."
Diffstat (limited to 'fs/pstore/ftrace.c')
0 files changed, 0 insertions, 0 deletions