Merge remote-tracking branch 'workqueues/for-next'

Conflicts:
	drivers/hid/hid-picolcd.c

diff --cc drivers/char/tpm/tpm.c
index 39526c05315813ae3651b544c2998e1e97d5d10b,3af9f4d1a23f200a27d8c03de477131967d0cbfd..659f0394ec15db735e4f4e2a245180998450740a
--- 1/drivers/char/tpm/tpm.c
--- 2/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@@ -1168,10 -1172,10 +1168,10 @@@ int tpm_release(struct inode *inode, st
        struct tpm_chip *chip = file->private_data;
  
        del_singleshot_timer_sync(&chip->user_read_timer);
-       flush_work_sync(&chip->work);
+       flush_work(&chip->work);
        file->private_data = NULL;
        atomic_set(&chip->data_pending, 0);
 -      kfree(chip->data_buffer);
 +      kzfree(chip->data_buffer);
        clear_bit(0, &chip->is_open);
        put_device(chip->dev);
        return 0;
@@@ -1221,8 -1225,9 +1221,8 @@@ ssize_t tpm_read(struct file *file, cha
        int rc;
  
        del_singleshot_timer_sync(&chip->user_read_timer);
-       flush_work_sync(&chip->work);
+       flush_work(&chip->work);
        ret_size = atomic_read(&chip->data_pending);
 -      atomic_set(&chip->data_pending, 0);
        if (ret_size > 0) {     /* relay data */
                ssize_t orig_ret_size = ret_size;
                if (size < ret_size)

diff --cc drivers/cpufreq/cpufreq_conservative.c
Simple merge

diff --cc drivers/media/dvb-core/dvb_net.c
Simple merge

diff --cc drivers/media/pci/bt8xx/bttv-driver.c
Simple merge

diff --cc drivers/media/pci/cx18/cx18-driver.c
Simple merge

diff --cc drivers/media/pci/cx23885/cx23885-input.c
Simple merge

diff --cc drivers/media/pci/cx88/cx88-mpeg.c
Simple merge

diff --cc drivers/media/pci/mantis/mantis_evm.c
Simple merge

diff --cc drivers/media/pci/mantis/mantis_uart.c
Simple merge

diff --cc drivers/media/pci/saa7134/saa7134-core.c
Simple merge

diff --cc drivers/media/pci/saa7134/saa7134-empress.c
Simple merge

diff --cc drivers/media/platform/omap24xxcam.c
Simple merge

diff --cc drivers/media/usb/cx231xx/cx231xx-cards.c
Simple merge

diff --cc drivers/media/usb/em28xx/em28xx-cards.c
Simple merge

diff --cc drivers/media/usb/tm6000/tm6000-cards.c
Simple merge

diff --cc drivers/mtd/mtdoops.c
Simple merge

diff --cc drivers/net/ethernet/sun/niu.c
Simple merge

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc drivers/power/ab8500_btemp.c
Simple merge

diff --cc drivers/power/ab8500_charger.c
Simple merge

diff --cc drivers/power/ab8500_fg.c
Simple merge

diff --cc drivers/power/charger-manager.c
Simple merge

diff --cc drivers/power/wm97xx_battery.c
Simple merge

diff --cc drivers/regulator/core.c
Simple merge

diff --cc drivers/scsi/ipr.c
Simple merge

diff --cc drivers/thermal/thermal_sys.c
index 47498b8719032668f02c08c235614f0e55464ade,67789b8345d25cb7a5fad998863aab3c9d999689..d552a96f08cd1bf1abd12f2977a5ffd35eef6da5
--- 1/drivers/thermal/thermal_sys.c
--- 2/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@@ -703,19 -694,84 +703,16 @@@ thermal_remove_hwmon_sysfs(struct therm
  static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,
                                            int delay)
  {
-       cancel_delayed_work(&(tz->poll_queue));
- 
-       if (!delay)
-               return;
- 
        if (delay > 1000)
-               queue_delayed_work(system_freezable_wq, &(tz->poll_queue),
-                                     round_jiffies(msecs_to_jiffies(delay)));
+               mod_delayed_work(system_freezable_wq, &tz->poll_queue,
+                                round_jiffies(msecs_to_jiffies(delay)));
+       else if (delay)
+               mod_delayed_work(system_freezable_wq, &tz->poll_queue,
+                                msecs_to_jiffies(delay));
        else
-               queue_delayed_work(system_freezable_wq, &(tz->poll_queue),
-                                     msecs_to_jiffies(delay));
+               cancel_delayed_work(&tz->poll_queue);
  }
  
 -static void thermal_zone_device_passive(struct thermal_zone_device *tz,
 -                                      int temp, int trip_temp, int trip)
 -{
 -      int trend = 0;
 -      struct thermal_cooling_device_instance *instance;
 -      struct thermal_cooling_device *cdev;
 -      long state, max_state;
 -
 -      /*
 -       * Above Trip?
 -       * -----------
 -       * Calculate the thermal trend (using the passive cooling equation)
 -       * and modify the performance limit for all passive cooling devices
 -       * accordingly.  Note that we assume symmetry.
 -       */
 -      if (temp >= trip_temp) {
 -              tz->passive = true;
 -
 -              trend = (tz->tc1 * (temp - tz->last_temperature)) +
 -                      (tz->tc2 * (temp - trip_temp));
 -
 -              /* Heating up? */
 -              if (trend > 0) {
 -                      list_for_each_entry(instance, &tz->cooling_devices,
 -                                          node) {
 -                              if (instance->trip != trip)
 -                                      continue;
 -                              cdev = instance->cdev;
 -                              cdev->ops->get_cur_state(cdev, &state);
 -                              cdev->ops->get_max_state(cdev, &max_state);
 -                              if (state++ < max_state)
 -                                      cdev->ops->set_cur_state(cdev, state);
 -                      }
 -              } else if (trend < 0) { /* Cooling off? */
 -                      list_for_each_entry(instance, &tz->cooling_devices,
 -                                          node) {
 -                              if (instance->trip != trip)
 -                                      continue;
 -                              cdev = instance->cdev;
 -                              cdev->ops->get_cur_state(cdev, &state);
 -                              cdev->ops->get_max_state(cdev, &max_state);
 -                              if (state > 0)
 -                                      cdev->ops->set_cur_state(cdev, --state);
 -                      }
 -              }
 -              return;
 -      }
 -
 -      /*
 -       * Below Trip?
 -       * -----------
 -       * Implement passive cooling hysteresis to slowly increase performance
 -       * and avoid thrashing around the passive trip point.  Note that we
 -       * assume symmetry.
 -       */
 -      list_for_each_entry(instance, &tz->cooling_devices, node) {
 -              if (instance->trip != trip)
 -                      continue;
 -              cdev = instance->cdev;
 -              cdev->ops->get_cur_state(cdev, &state);
 -              cdev->ops->get_max_state(cdev, &max_state);
 -              if (state > 0)
 -                      cdev->ops->set_cur_state(cdev, --state);
 -              if (state == 0)
 -                      tz->passive = false;
 -      }
 -}
 -
  static void thermal_zone_device_check(struct work_struct *work)
  {
        struct thermal_zone_device *tz = container_of(work, struct

diff --cc drivers/tty/serial/kgdboc.c
Simple merge

diff --cc fs/gfs2/super.c
Simple merge

diff --cc mm/slab.c
Simple merge

diff --cc net/9p/trans_fd.c
Simple merge

diff --cc net/core/dst.c
Simple merge

diff --cc net/core/link_watch.c
Simple merge

diff --cc sound/pci/oxygen/oxygen_lib.c
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge