diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-29 17:13:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-29 17:13:07 -0800 |
| commit | 04527fdafe2e12ad2d89bfd0f0bb7fe481687976 (patch) | |
| tree | 680d47037ef787522b6d8476dfe62c40e36ddf90 /arch/mips/pci/pci-rt2880.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending (diff) | |
| parent | ARM: 8454/1: OF implies OF_FLATTREE (diff) | |
| download | linux-dev-04527fdafe2e12ad2d89bfd0f0bb7fe481687976.tar.xz linux-dev-04527fdafe2e12ad2d89bfd0f0bb7fe481687976.zip | |
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
Diffstat (limited to 'arch/mips/pci/pci-rt2880.c')
0 files changed, 0 insertions, 0 deletions