mirror of
https://github.com/torvalds/linux.git
synced 2026-07-04 20:18:02 +02: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()
...
|
||
|---|---|---|
| .. | ||
| adp5520-keys.c | ||
| adp5588-keys.c | ||
| adp5589-keys.c | ||
| amikbd.c | ||
| atakbd.c | ||
| atkbd.c | ||
| bf54x-keys.c | ||
| davinci_keyscan.c | ||
| ep93xx_keypad.c | ||
| goldfish_events.c | ||
| gpio_keys_polled.c | ||
| gpio_keys.c | ||
| hil_kbd.c | ||
| hilkbd.c | ||
| hpps2atkbd.h | ||
| imx_keypad.c | ||
| jornada680_kbd.c | ||
| jornada720_kbd.c | ||
| Kconfig | ||
| lkkbd.c | ||
| lm8323.c | ||
| lm8333.c | ||
| locomokbd.c | ||
| lpc32xx-keys.c | ||
| Makefile | ||
| maple_keyb.c | ||
| matrix_keypad.c | ||
| max7359_keypad.c | ||
| mcs_touchkey.c | ||
| mpr121_touchkey.c | ||
| newtonkbd.c | ||
| nomadik-ske-keypad.c | ||
| omap-keypad.c | ||
| omap4-keypad.c | ||
| opencores-kbd.c | ||
| pmic8xxx-keypad.c | ||
| pxa27x_keypad.c | ||
| pxa930_rotary.c | ||
| qt1070.c | ||
| qt2160.c | ||
| samsung-keypad.c | ||
| sh_keysc.c | ||
| spear-keyboard.c | ||
| stmpe-keypad.c | ||
| stowaway.c | ||
| sunkbd.c | ||
| tc3589x-keypad.c | ||
| tca6416-keypad.c | ||
| tca8418_keypad.c | ||
| tegra-kbc.c | ||
| tnetv107x-keypad.c | ||
| twl4030_keypad.c | ||
| w90p910_keypad.c | ||
| xtkbd.c | ||