Merge commit 'v3.0' into android-3.0
authorColin Cross <ccross@android.com>
Thu, 11 Aug 2011 01:04:30 +0000 (18:04 -0700)
committerColin Cross <ccross@android.com>
Thu, 11 Aug 2011 01:04:30 +0000 (18:04 -0700)
commit4e111751cfcb75f26d2725eab934b6eb91a3d115
treeb3d63b5b44bd2036db6e0f0b2e81769c84cc5ca3
parentca64b0cd3a12d7704f4e98f4f5d51f41eb5047a2
parent02f8c6aee8df3cdc935e9bdd4f2d020306035dbe
Merge commit 'v3.0' into android-3.0
include/linux/sched.h
kernel/sched.c