diff options
author | Olof Johansson <olof@lixom.net> | 2014-07-07 22:41:47 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-07-07 22:42:24 -0700 |
commit | 3ae22f4d94e5b69b8d9b8b1ce2702043e4aca43d (patch) | |
tree | c4777bd224a87c2f313a3ca6dcff216dd3d7c5c1 /fs/ocfs2/super.c | |
parent | b3c20e983269667ecce75fa7f4b0353917a8d0d1 (diff) | |
parent | 7b7dfdd2b9927c1861bb6d03ca35261f1739aceb (diff) | |
download | blackbird-op-linux-3ae22f4d94e5b69b8d9b8b1ce2702043e4aca43d.tar.gz blackbird-op-linux-3ae22f4d94e5b69b8d9b8b1ce2702043e4aca43d.zip |
Merge tag 'berlin-soc-3.17-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/soc
Merge "Berlin SoC changes for v3.17" from Sebastian Hesselbarth:
- SMP support for BG2 and BG2Q
* tag 'berlin-soc-3.17-1' of git://git.infradead.org/users/hesselba/linux-berlin:
ARM: berlin: add SMP support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'fs/ocfs2/super.c')
0 files changed, 0 insertions, 0 deletions