projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 36511e8 aa7d5f1)
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2015 01:13:07 +0000 (17:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2015 01:13:07 +0000 (17:13 -0800)
commit04527fdafe2e12ad2d89bfd0f0bb7fe481687976
tree680d47037ef787522b6d8476dfe62c40e36ddf90tree | snapshot
parent36511e86079c57077493a07be60b39376d7cea74commit | diff
parentaa7d5f18e54529ae58a494447ee9b610d379b8d2commit | 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
John Crispins staging tree