Merge tag 'v3.9-rc3' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 18 Mar 2013 02:40:50 +0000 (19:40 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 18 Mar 2013 02:40:50 +0000 (19:40 -0700)
Merge with mainline to bring in module_platform_driver_probe() and
devm_ioremap_resource().

1  2 
drivers/base/devres.c
drivers/input/misc/Kconfig
drivers/input/misc/Makefile
drivers/input/serio/Kconfig
drivers/usb/class/cdc-acm.c
include/linux/device.h
include/uapi/linux/input.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge