tmp_suning_uos_patched/drivers/base/power
Linus Torvalds 008d23e485 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
2011-01-13 10:05:56 -08:00
..
generic_ops.c PM / Runtime: Generic resume shouldn't set RPM_ACTIVE unconditionally 2010-12-24 15:04:06 +01:00
main.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
Makefile PM: Introduce library for device-specific OPPs (v7) 2010-10-17 01:57:50 +02:00
opp.c PM: Introduce library for device-specific OPPs (v7) 2010-10-17 01:57:50 +02:00
power.h PM / Runtime: Add no_callbacks flag 2010-10-17 01:57:47 +02:00
runtime.c PM / Runtime: Add synchronous runtime interface for interrupt handlers (v3) 2010-12-24 15:02:41 +01:00
sysfs.c PM / Runtime: Implement autosuspend support 2010-10-17 01:57:48 +02:00
trace.c PM: Add sysfs attr for rechecking dev hash from PM trace 2010-10-17 01:57:50 +02:00
wakeup.c PM / Wakeup: Replace pm_check_wakeup_events() with pm_wakeup_pending() 2010-12-24 15:02:42 +01:00