| commit | 04527fdafe2e12ad2d89bfd0f0bb7fe481687976 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Nov 29 17:13:07 2015 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Nov 29 17:13:07 2015 -0800 |
| tree | 680d47037ef787522b6d8476dfe62c40e36ddf90 | |
| parent | 36511e86079c57077493a07be60b39376d7cea74 [diff] | |
| parent | aa7d5f18e54529ae58a494447ee9b610d379b8d2 [diff] |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"Just two changes this time around:
- wire up the new mlock2 syscall added during the last merge window
- fix a build problem with certain configurations provoked by making
CONFIG_OF user selectable"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: 8454/1: OF implies OF_FLATTREE
ARM: wire up mlock2 syscall