Merge branch 'p/anton.e/master' of git:projects/modsched/freebsd into p/jkrieg/master
authorJens Krieg <jkrieg@mailbox.tu-berlin.de>
Mon, 27 Jan 2014 15:53:21 +0000 (16:53 +0100)
committerJens Krieg <jkrieg@mailbox.tu-berlin.de>
Mon, 27 Jan 2014 15:53:21 +0000 (16:53 +0100)
commit1b7898ffe581099e5d55e9c7cb8b33480538578d
tree5c2a7117c5717e375c52dc7546ff5290d276e1e4
parent328f4e37312a8ac4141ff67ac72b07d97a95adf0
parent89442079e7f8b00baa5a24bbb0c1af67536818a4
Merge branch 'p/anton.e/master' of git:projects/modsched/freebsd into p/jkrieg/master

Conflicts:
sys/kern/subr_sleepqueue.c
sys/kern/kern_fork.c