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
..
acpi	Merge branch 'acpi-cleanup'	2013-02-15 13:58:30 +01:00
asm-generic	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2013-01-23 13:31:15 -08:00
clocksource
crypto
drm	Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel	2013-01-11 07:52:48 +10:00
keys
linux	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2013-02-18 22:34:11 +01:00
math-emu
media
memory
misc
net	ipv6: rename datagram_send_ctl and datagram_recv_ctl	2013-01-31 13:53:08 -05:00
pcmcia
ras
rdma	UAPI: Remove empty Kbuild files	2013-01-02 17:36:10 -08:00
rxrpc
scsi
sound	Merge remote-tracking branch 'asoc/fix/cs4271' into tmp	2013-01-10 12:22:11 +00:00
target	target: Introduce TCM_NO_SENSE	2013-01-10 20:06:08 -08:00
trace	PM / tracing: remove deprecated power trace API	2013-01-26 00:39:12 +01:00
uapi	USB/xhci: Misc fixes for 3.8.	2013-01-25 13:33:17 -08:00
video
xen
Kbuild	UAPI: Remove empty Kbuild files	2013-01-02 17:36:10 -08:00