Merge commit 'linus/master' into sched-fixes-for-linus
authorIngo Molnar <mingo@elte.hu>
Thu, 29 May 2008 14:05:05 +0000 (16:05 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 29 May 2008 14:05:05 +0000 (16:05 +0200)
commit6715930654e06c4d2e66e718ea159079f71838f4
tree6a0a19fb62f3e99cb5f6bf6c34ae541f7c30fb42
parentea3f01f8afd3bc5daff915cc4ea5cc5ea9e7d427
parente490517a039a99d692cb3a5561941b0a5f576172
Merge commit 'linus/master' into sched-fixes-for-linus
include/linux/sched.h