Rafael J. Wysocki 10baf04e95 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux ... * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (35 commits) PM idle: remove global declaration of pm_idle unicore32 idle: delete stray pm_idle comment openrisc idle: delete pm_idle mn10300 idle: delete pm_idle microblaze idle: delete pm_idle m32r idle: delete pm_idle, and other dead idle code ia64 idle: delete pm_idle cris idle: delete idle and pm_idle ARM64 idle: delete pm_idle ARM idle: delete pm_idle blackfin idle: delete pm_idle sparc idle: rename pm_idle to sparc_idle sh idle: rename global pm_idle to static sh_idle x86 idle: rename global pm_idle to static x86_idle APM idle: register apm_cpu_idle via cpuidle tools/power turbostat: display SMI count by default intel_idle: export both C1 and C1E cpuidle: remove vestage definition of cpuidle_state_usage.driver_data x86 idle: remove 32-bit-only "no-hlt" parameter, hlt_works_ok flag x86 idle: remove mwait_idle() and "idle=mwait" cmdline param ... Conflicts: arch/x86/kernel/process.c (with PM / tracing commit 43720bd) drivers/acpi/processor_idle.c (with ACPICA commit 4f84291)		2013-02-18 22:34:11 +01:00
..
arch-v10	flagday: don't pass regs to copy_thread()	2012-11-28 23:43:42 -05:00
arch-v32	ARCH: drivers remove __dev* attributes.	2013-01-03 15:57:13 -08:00
boot	Fix common misspellings	2011-03-31 11:26:23 -03:00
configs	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
include	cris: Provide dma_mmap_coherent() and dma_get_sgtable()	2013-01-29 08:11:14 +01:00
kernel	cris idle: delete idle and pm_idle	2013-02-17 23:37:05 -05:00
mm	readahead: fault retry breaks mmap file read random detection	2012-10-09 16:22:47 +09:00
Kconfig	Bury the conditionals from kernel_thread/kernel_execve series	2012-12-19 18:07:38 -05:00
Kconfig.debug	Kconfig: remove a few puzzling comments	2011-10-31 10:58:48 +01:00
Makefile	UAPI: Partition the header include path sets and add uapi/ header directories	2012-10-02 18:01:26 +01:00