Merge commit 'v3.0' into android-3.0

author Colin Cross <ccross@android.com>

Thu, 11 Aug 2011 01:04:30 +0000 (18:04 -0700)

committer Colin Cross <ccross@android.com>

Thu, 11 Aug 2011 01:04:30 +0000 (18:04 -0700)
author Colin Cross <ccross@android.com>
Thu, 11 Aug 2011 01:04:30 +0000 (18:04 -0700)
committer Colin Cross <ccross@android.com>
Thu, 11 Aug 2011 01:04:30 +0000 (18:04 -0700)
diff --cc include/linux/sched.h
Simple merge
diff --cc kernel/sched.c
Simple merge
author	Colin Cross <ccross@android.com>
	Thu, 11 Aug 2011 01:04:30 +0000 (18:04 -0700)
committer	Colin Cross <ccross@android.com>
	Thu, 11 Aug 2011 01:04:30 +0000 (18:04 -0700)
		1	2
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	patch \|	diff1 \|	diff2 \|	blob \| history