diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-11-11 16:16:25 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-11-11 16:16:25 +0900 |
| commit | 37bef8f989ed85cdc6cf6fb9c1b1c096179b0708 (patch) | |
| tree | bf90e7eaa25d3fb36a8cb2f88e75f49727e8c04a /arch/sparc/kernel/nmi.c | |
| parent | 149c370f3e06a6b43bf1d922ccd1f969c59c7c77 (diff) | |
| parent | d03299ee6020b0cc64fc4180162fb2e8795394e1 (diff) | |
| parent | 79e7066415a8b12adbeacc41b3dc44423534b8be (diff) | |
| download | blackbird-obmc-linux-37bef8f989ed85cdc6cf6fb9c1b1c096179b0708.tar.gz blackbird-obmc-linux-37bef8f989ed85cdc6cf6fb9c1b1c096179b0708.zip | |
Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus
