diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-31 16:50:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-31 16:50:31 -0800 |
| commit | 510ae0c994cb38fcf5033ad69eb8103552e335e8 (patch) | |
| tree | 9414e8a68f91a1c61275c80bb95b390cd889689f /arch/x86/include/asm/irq.h | |
| parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | Revert "MIPS: bcm63xx: nvram: Remove unused bcm63xx_nvram_get_psi_size() function" (diff) | |
| download | linux-dev-510ae0c994cb38fcf5033ad69eb8103552e335e8.tar.xz linux-dev-510ae0c994cb38fcf5033ad69eb8103552e335e8.zip | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fix from Ralf Baechle:
"Just a single revert for a patch which I had upstreamed out of
sequence"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
Revert "MIPS: bcm63xx: nvram: Remove unused bcm63xx_nvram_get_psi_size() function"
Diffstat (limited to 'arch/x86/include/asm/irq.h')
0 files changed, 0 insertions, 0 deletions