diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-18 23:31:29 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-18 23:31:29 -0700 |
| commit | 19a64d9d591f9d188707e86e53bc0c4ed99ac8f0 (patch) | |
| tree | 189b0be9a34730f9ea02c1e4bfb2cd0787c00367 /fs/nfs/objlayout/objlayout.c | |
| parent | 815acebff7ac578970986ca3f0ff406c92a0e243 (diff) | |
| parent | 4da773193414788b52ae14bc246543390faca5ce (diff) | |
Merge branch 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc
Repeat pull of soc-core to bring in a bugfix.
* 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas:
ARM: mach-shmobile: sh73a0: fixup PINT/IRQ16-IRQ31 irq number conflict
Diffstat (limited to 'fs/nfs/objlayout/objlayout.c')
0 files changed, 0 insertions, 0 deletions