kernel-ark/arch/blackfin
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 Kbuild: centralize MKIMAGE and cmd_uimage definitions 2012-03-26 15:49:20 +02:00
configs arch: Change defconfigs to point to g_mass_storage. 2012-11-08 16:00:52 +02:00
include blackfin: Provide dma_mmap_coherent() and dma_get_sgtable() 2013-01-29 08:11:14 +01:00
kernel blackfin idle: delete pm_idle 2013-02-17 23:37:04 -05:00
lib blackfin: license: Change ADI BSD license 2012-05-21 14:54:30 +08:00
mach-bf518 blackfin: anomaly: add anomaly 16000030 for bf5xx 2012-12-13 15:22:03 +08:00
mach-bf527 blackfin: anomaly: add anomaly 16000030 for bf5xx 2012-12-13 15:22:03 +08:00
mach-bf533 blackfin: anomaly: add anomaly 16000030 for bf5xx 2012-12-13 15:22:03 +08:00
mach-bf537 blackfin: anomaly: add anomaly 16000030 for bf5xx 2012-12-13 15:22:03 +08:00
mach-bf538 blackfin: anomaly: add anomaly 16000030 for bf5xx 2012-12-13 15:22:03 +08:00
mach-bf548 blackfin: anomaly: add anomaly 16000030 for bf5xx 2012-12-13 15:22:03 +08:00
mach-bf561 blackfin: anomaly: add anomaly 16000030 for bf5xx 2012-12-13 15:22:03 +08:00
mach-bf609 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin 2012-12-18 10:54:27 -08:00
mach-common ARCH: drivers remove __dev* attributes. 2013-01-03 15:57:13 -08:00
mm treewide: fix printk typo in multiple drivers 2012-11-19 11:08:17 +01:00
oprofile
Clear_BSD.txt blackfin: license: Change ADI BSD license 2012-05-21 14:54:30 +08:00
Kconfig Bury the conditionals from kernel_thread/kernel_execve series 2012-12-19 18:07:38 -05:00
Kconfig.debug blackfin: bf60x: pm: Add a debug option to calculate kernel wakeup time. 2012-05-21 14:54:52 +08:00
Makefile kbuild: add symbol prefix arg to kallsyms 2012-09-11 10:25:12 +08:00