1
0
Fork 0
alistair23-linux/Documentation/zh_CN
Linus Torvalds 06991c28f3 Driver core patches for 3.9-rc1
Here is the big driver core merge for 3.9-rc1
 
 There are two major series here, both of which touch lots of drivers all
 over the kernel, and will cause you some merge conflicts:
   - add a new function called devm_ioremap_resource() to properly be
     able to check return values.
   - remove CONFIG_EXPERIMENTAL
 
 If you need me to provide a merged tree to handle these resolutions,
 please let me know.
 
 Other than those patches, there's not much here, some minor fixes and
 updates.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iEYEABECAAYFAlEmV0cACgkQMUfUDdst+yncCQCfbmnQZju7kzWXk6PjdFuKspT9
 weAAoMCzcAtEzzc4LXuUxxG/sXBVBCjW
 =yWAQ
 -----END PGP SIGNATURE-----

Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core patches from Greg Kroah-Hartman:
 "Here is the big driver core merge for 3.9-rc1

  There are two major series here, both of which touch lots of drivers
  all over the kernel, and will cause you some merge conflicts:

   - add a new function called devm_ioremap_resource() to properly be
     able to check return values.

   - remove CONFIG_EXPERIMENTAL

  Other than those patches, there's not much here, some minor fixes and
  updates"

Fix up trivial conflicts

* tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
  base: memory: fix soft/hard_offline_page permissions
  drivercore: Fix ordering between deferred_probe and exiting initcalls
  backlight: fix class_find_device() arguments
  TTY: mark tty_get_device call with the proper const values
  driver-core: constify data for class_find_device()
  firmware: Ignore abort check when no user-helper is used
  firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
  firmware: Make user-mode helper optional
  firmware: Refactoring for splitting user-mode helper code
  Driver core: treat unregistered bus_types as having no devices
  watchdog: Convert to devm_ioremap_resource()
  thermal: Convert to devm_ioremap_resource()
  spi: Convert to devm_ioremap_resource()
  power: Convert to devm_ioremap_resource()
  mtd: Convert to devm_ioremap_resource()
  mmc: Convert to devm_ioremap_resource()
  mfd: Convert to devm_ioremap_resource()
  media: Convert to devm_ioremap_resource()
  iommu: Convert to devm_ioremap_resource()
  drm: Convert to devm_ioremap_resource()
  ...
2013-02-21 12:05:51 -08:00
..
arm Documentation: Chinese translation of Documentation/arm/kernel_user_helpers.txt 2012-11-15 17:46:42 -08:00
arm64 Documentation:Update Documentation/zh_CN/arm64/memory.txt 2012-11-26 16:25:37 -08:00
filesystems Documentation: Chinese translation of Documentation/filesystems/sysfs.txt 2012-09-04 16:08:29 -07:00
video4linux Documentation: remove __dev* attributes. 2013-01-03 15:57:16 -08:00
CodingStyle Documentation: remove depends on CONFIG_EXPERIMENTAL 2013-01-11 11:38:03 -08:00
HOWTO driver-core: documentation: fix up Greg's email address 2012-02-15 14:48:01 -08:00
IRQ.txt Documentation:Chinese translation of Documentation/IRQ.txt 2012-10-25 11:54:06 -07:00
SecurityBugs Translate Documentation/SecurityBugs into Chinese 2011-02-03 15:44:22 -08:00
SubmittingDrivers Docs/Kconfig: Update: osdl.org -> linuxfoundation.org 2010-11-15 23:50:13 +01:00
SubmittingPatches Fix spelling mistakes in Documentation/zh_CN/SubmittingPatches 2011-02-28 19:30:48 -08:00
basic_profiling.txt Document:add Chinese translation of basic_profiling.txt 2012-09-06 15:09:25 -07:00
email-clients.txt Documentation/zh_CN: Fix messy code file email-clients.txt 2011-07-01 15:15:56 -07:00
gpio.txt Documentation: Fixes some translation error in Documentation/zh_CN/gpio.txt 2012-09-26 13:12:32 -07:00
magic-number.txt wanrouter: completely decouple obsolete code from kernel. 2013-01-31 19:20:33 -05:00
oops-tracing.txt Chinese: add translation of oops-tracing.txt 2008-01-24 20:40:03 -08:00
sparse.txt update email address 2010-07-19 10:56:54 +02:00
stable_api_nonsense.txt Chinese translation of Documentation/stable_api_nonsense.txt 2007-07-18 16:02:12 -07:00
stable_kernel_rules.txt Chinese: add translation of stable_kernel_rules.txt 2008-01-24 20:40:03 -08:00
volatile-considered-harmful.txt Chinese: add translation of volatile-considered-harmful.txt 2008-01-24 20:40:03 -08:00