diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-30 20:40:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-30 20:40:42 -0500 |
| commit | 1e6d88ccf41c7ef2d6c99aa5e7fb9215aa0e5423 (patch) | |
| tree | 62f5250921c403703c7050f44d33fd2dafce899e /fs/jbd2/commit.c | |
| parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| parent | nios2: Replace fdt_translate_address with of_flat_dt_translate_address (diff) | |
| download | wireguard-linux-1e6d88ccf41c7ef2d6c99aa5e7fb9215aa0e5423.tar.xz wireguard-linux-1e6d88ccf41c7ef2d6c99aa5e7fb9215aa0e5423.zip | |
Merge tag 'nios2-v4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2
Pull nios2 fix from Ley Foon Tan:
"Replace fdt_translate_address with of_flat_dt_translate_address"
Fixes a build failure.
* tag 'nios2-v4.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
nios2: Replace fdt_translate_address with of_flat_dt_translate_address
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions