Arnd Bergmann 366695ff70 Merge branches 'depends/pinctrl/devel' and 'depends/rmk/clkdev' into spear/pinctrl ... The spear/pinctrl branch has hard dependencies on both the pinctrl branch and the clkdev branch. We merge those here to fix it up without having to rebase a branch that has been pulled into other stable branches already. Conflicts: Documentation/driver-model/devres.txt Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-05-12 20:38:42 +02:00
..
binding.txt	docs/driver-model: Update device class docs	2011-08-24 16:01:24 -07:00
bus.txt	driver core: remove the driver-model structures from the documentation	2011-05-06 18:01:05 -07:00
class.txt	driver core: remove the driver-model structures from the documentation	2011-05-06 18:01:05 -07:00
device.txt	docs/driver-model: Document device.groups	2011-08-24 16:01:24 -07:00
devres.txt	Merge branches 'depends/pinctrl/devel' and 'depends/rmk/clkdev' into spear/pinctrl	2012-05-12 20:38:42 +02:00
driver.txt	driver core: remove the driver-model structures from the documentation	2011-05-06 18:01:05 -07:00
overview.txt	DOCUMENTATION: Update overview.txt in Doc/driver-model.	2011-06-07 10:04:21 -07:00
platform.txt	Fix spelling of 'platform' in comments and doc	2010-02-05 12:22:34 +01:00
porting.txt