projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d1d9cfc 62183dc)
Merge tag 'ktest-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Apr 2014 04:27:43 +0000 (21:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Apr 2014 04:27:43 +0000 (21:27 -0700)
commit05b1332eafba8eb250da2d2c4c52ed436a127f90
treea97e83e9638dd7cea7e236592c4e664caaa8ce99tree | snapshot
parentd1d9cfc330e2622f4b4e0b82d3b41a34619614d4commit | diff
parent62183dcac539a14ed0a820b8392db353d72a7d7ecommit | diff
Merge tag 'ktest-v3.15' of git://git./linux/kernel/git/rostedt/linux-ktest

Pull single ktest fix from Steven Rostedt:
 "This just contains a single update by Satoru Takeuchi, which adds
  CLOSE_CONSOLE_SIGNAL to the kvm.conf file, as the kvm guest requires a
  different signal than a normal console uses"

* tag 'ktest-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
  ktest: Set CLOSE_CONSOLE_SIGNAL in the kvm.conf
Linux Kernel tree with some unpolished code for Colibri/Apalis modules