]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c3b30fe 465cf61)
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)
commita2112a90a110b588c28f1a2b421ef72a668a2377
tree680d47037ef787522b6d8476dfe62c40e36ddf90tree | snapshot
parentc3b30fe347586d9e2234d554df05605b61db1858commit | diff
parent465cf6106c4967e6b3f41bb91b8161d72460f55acommit | 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
Linux Kernel Source Tree.