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)
commitca62cf59ceef10ff2ebca0e7f764507186870270
tree480ebfd5551db27052f501917a7e0314043c6778
parent2e7d0f60d8b976c951621c1bc82acf0654089c0b
parent27be457000211a6903968dfce06d5f73f051a217
Merge branch 'misc' into release

Conflicts:
arch/x86/kernel/process.c

Signed-off-by: Len Brown <len.brown@intel.com>
arch/x86/kernel/process.c
drivers/acpi/processor_idle.c