mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 21:33:00 +00:00
06991c28f3
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()
...
|
||
|---|---|---|
| .. | ||
| bcm47xxnflash | ||
| gpmi-nand | ||
| alauda.c | ||
| ams-delta.c | ||
| atmel_nand_ecc.h | ||
| atmel_nand.c | ||
| au1550nd.c | ||
| bf5xx_nand.c | ||
| cafe_nand.c | ||
| cmx270_nand.c | ||
| cs553x_nand.c | ||
| davinci_nand.c | ||
| denali_dt.c | ||
| denali_pci.c | ||
| denali.c | ||
| denali.h | ||
| diskonchip.c | ||
| docg4.c | ||
| fsl_elbc_nand.c | ||
| fsl_ifc_nand.c | ||
| fsl_upm.c | ||
| fsmc_nand.c | ||
| gpio.c | ||
| h1910.c | ||
| jz4740_nand.c | ||
| Kconfig | ||
| lpc32xx_mlc.c | ||
| lpc32xx_slc.c | ||
| Makefile | ||
| mpc5121_nfc.c | ||
| mxc_nand.c | ||
| nand_base.c | ||
| nand_bbt.c | ||
| nand_bch.c | ||
| nand_ecc.c | ||
| nand_ids.c | ||
| nandsim.c | ||
| ndfc.c | ||
| nuc900_nand.c | ||
| omap2.c | ||
| orion_nand.c | ||
| pasemi_nand.c | ||
| plat_nand.c | ||
| ppchameleonevb.c | ||
| pxa3xx_nand.c | ||
| r852.c | ||
| r852.h | ||
| rtc_from4.c | ||
| s3c2410.c | ||
| sh_flctl.c | ||
| sharpsl.c | ||
| sm_common.c | ||
| sm_common.h | ||
| socrates_nand.c | ||
| tmio_nand.c | ||
| txx9ndfmc.c | ||
| xway_nand.c | ||