]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge tag 'v3.0-rc7' into staging/for_v3.1
authorMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 13 Jul 2011 04:42:56 +0000 (01:42 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 13 Jul 2011 04:42:56 +0000 (01:42 -0300)
commitb0ee37889c11650f3df3417f3887f0a49b5fda5c
tree6d02fc332eaa6c1ac94349c00533542c3b4d5721
parentd48d4e7116ad1254957ff2557037c774b197a391
parent620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc
Merge tag 'v3.0-rc7' into staging/for_v3.1

* tag 'v3.0-rc7': (1612 commits)
  Linux 3.0-rc7
  Documentation/Changes: remove some really obsolete text
  ath5k: Add missing breaks in switch/case
  Documentation/spinlocks.txt: Remove reference to sti()/cli()
  cifs: drop spinlock before calling cifs_put_tlink
  hp-wmi: fix use after free
  dell-laptop - using buffer without mutex_lock
  Revert: "dell-laptop: Toggle the unsupported hardware killswitch"
  PM: Reintroduce dropped call to check_wakeup_irqs
  [CPUFREQ] fix cpumask memory leak in acpi-cpufreq on cpu hotplug.
  hwmon: (pmbus) Improve auto-detection of temperature status register
  hwmon: (lm95241) Fix negative temperature results
  firewire: ohci: do not bind to Pinnacle cards, avert panic
  cifs: fix expand_dfs_referral
  cifs: move bdi_setup_and_register outside of CONFIG_CIFS_DFS_UPCALL
  ALSA: hda - Fix a copmile warning
  MAINTAINERS: update Bjorn Helgaas's email address
  drivers/leds/leds-pca9532.c: change driver name to be unique
  mm/nommu.c: fix remap_pfn_range()
  w1: ds1wm: add a reset recovery parameter
  ...

Conflicts:
Documentation/feature-removal-schedule.txt
Documentation/feature-removal-schedule.txt
drivers/media/video/bt8xx/bttv-driver.c
drivers/media/video/cx18/cx18-ioctl.c
drivers/media/video/cx23885/cx23885-cards.c
drivers/media/video/ivtv/ivtv-ioctl.c
drivers/media/video/tuner-core.c
drivers/media/video/v4l2-ioctl.c
include/media/v4l2-subdev.h