diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-27 04:46:23 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-27 04:46:23 +0100 |
commit | a9a07d40bc9c57881555b64fe8bf66fd28e2f13a (patch) | |
tree | 20c08b4e6756db92bf7720d5ca1af67b83430828 /fs/mpage.c | |
parent | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | openrisc: add missing header inclusion (diff) | |
download | linux-a9a07d40bc9c57881555b64fe8bf66fd28e2f13a.tar.xz linux-a9a07d40bc9c57881555b64fe8bf66fd28e2f13a.zip |
Merge branch 'for-upstream' of git://openrisc.net/jonas/linux
Pull OpenRISC updates from Jonas Bonn:
"An equal number of bug fixes and trivial cleanups; no new features.
- Two patches to fix errors thrown by the updated toolchain.
- Three other bug fixes.
- Four trivial cleanups."
* 'for-upstream' of git://openrisc.net/jonas/linux:
openrisc: add missing header inclusion
openrisc: really pass correct arg to schedule_tail
Add bitops include needed for ext2 filesystem
openrisc: update DTLB-miss handler last
openrisc: fix up vmalloc page table loading
openrisc idle: delete pm_idle
openrisc: remove CONFIG_SYMBOL_PREFIX
openrisc: avoid using function parameter regs in reset vector
openrisc: remove unused current_regs
Diffstat (limited to 'fs/mpage.c')
0 files changed, 0 insertions, 0 deletions