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
..
boot	MN10300: And Panasonic AM34 subarch and implement SMP	2010-10-27 17:28:55 +01:00
configs	cgroup: remove the ns_cgroup	2011-05-26 17:12:34 -07:00
include	mn10300: Provide dummy dma_mmap_coherent() and dma_get_sgtable()	2013-01-29 08:27:40 +01:00
kernel	mn10300 idle: delete pm_idle	2013-02-17 23:37:07 -05:00
lib	Disintegrate asm/system.h for MN10300	2012-03-28 18:30:02 +01:00
mm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-12-13 12:00:02 -08:00
oprofile	MN10300: Kill MN10300's own profiling Kconfig	2009-04-09 10:53:16 -07:00
proc-mn2ws0050	Disintegrate asm/system.h for MN10300	2012-03-28 18:30:02 +01:00
proc-mn103e010	MN10300: Create general kernel debugger cache flushing	2011-03-18 16:54:30 +00:00
unit-asb2303	mn10300: move setup_jiffies_interrupt() to cevt-mn10300.c	2012-07-11 16:04:41 -07:00
unit-asb2305	ARCH: drivers remove __dev* attributes.	2013-01-03 15:57:13 -08:00
unit-asb2364	mn10300: move setup_jiffies_interrupt() to cevt-mn10300.c	2012-07-11 16:04:41 -07:00
Kconfig	arch/mn10300/Kconfig: select CONFIG_GENERIC_ATOMIC64	2013-01-11 14:54:55 -08:00
Kconfig.debug	MN10300: Deprecate gdbstub	2011-03-18 16:54:32 +00:00
Makefile	mn10300: only add -mmem-funcs to KBUILD_CFLAGS if gcc supports it	2012-10-06 03:04:36 +09:00