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
..
alpha	ALPHA: drivers: remove __dev* attributes.	2013-01-03 15:57:13 -08:00
arm	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2013-02-18 22:34:11 +01:00
arm64	ARM64 idle: delete pm_idle	2013-02-17 23:37:05 -05:00
avr32	avr32: Provide dma_mmap_coherent() and dma_get_sgtable()	2013-01-29 08:11:14 +01:00
blackfin	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2013-02-18 22:34:11 +01:00
c6x	c6x: Provide dummy dma_mmap_coherent() and dma_get_sgtable()	2013-01-29 08:11:14 +01:00
cris	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2013-02-18 22:34:11 +01:00
frv	frv: Provide dummy dma_mmap_coherent() and dma_get_sgtable()	2013-01-29 08:11:15 +01:00
h8300	These are a few cleanups for asm-generic:	2012-12-21 16:39:08 -08:00
hexagon	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-12-20 18:05:28 -08:00
ia64	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2013-02-18 22:34:11 +01:00
m32r	m32r idle: delete pm_idle, and other dead idle code	2013-02-17 23:37:06 -05:00
m68k	m68k: Provide dma_mmap_coherent() and dma_get_sgtable()	2013-01-29 08:27:40 +01:00
microblaze	microblaze idle: delete pm_idle	2013-02-17 23:37:07 -05:00
mips	MIPS: Function tracer: Fix broken function tracing	2013-01-31 15:28:48 +01:00
mn10300	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2013-02-18 22:34:11 +01:00
openrisc	openrisc idle: delete pm_idle	2013-02-17 23:37:08 -05:00
parisc	parisc: Provide dummy dma_mmap_coherent() and dma_get_sgtable()	2013-01-29 08:27:41 +01:00
powerpc	powerpc/mm: Fix hash computation function	2013-02-04 15:15:08 +11:00
s390	s390/thp: implement pmdp_set_wrprotect()	2013-01-22 13:32:16 +01:00
score	ARCH: drivers remove __dev* attributes.	2013-01-03 15:57:13 -08:00
sh	sh idle: rename global pm_idle to static sh_idle	2013-02-17 23:34:59 -05:00
sparc	sparc idle: rename pm_idle to sparc_idle	2013-02-17 23:36:56 -05:00
tile	ARCH: drivers remove __dev* attributes.	2013-01-03 15:57:13 -08:00
um	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-12-20 18:05:28 -08:00
unicore32	unicore32 idle: delete stray pm_idle comment	2013-02-17 23:37:08 -05:00
x86	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2013-02-18 22:34:11 +01:00
xtensa	xtensa: Provide dummy dma_mmap_coherent() and dma_get_sgtable()	2013-01-29 08:27:41 +01:00
.gitignore
Kconfig	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-12-20 18:05:28 -08:00