Merge branch 'misc' into release
authorLen Brown <len.brown@intel.com>
Mon, 18 Feb 2013 05:25:53 +0000 (00:25 -0500)
committerLen Brown <len.brown@intel.com>
Mon, 18 Feb 2013 05:25:53 +0000 (00:25 -0500)
Conflicts:
arch/x86/kernel/process.c

Signed-off-by: Len Brown <len.brown@intel.com>

Trivial merge