Greg Kroah-Hartman 407f3fd8fa Merge 3.2-rc5 into staging-next ... This resolves the conflict in the drivers/staging/iio/industrialio-core.c file due to two different changes made to resolve the same problem. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2011-12-09 19:01:27 -08:00
..
bindings	Merge 3.2-rc5 into staging-next	2011-12-09 19:01:27 -08:00
00-INDEX	Documentation: add devicetree docs index file	2011-03-16 10:47:03 -07:00
booting-without-of.txt	dt: add documentation of ARM dt boot interface	2011-05-23 09:30:20 -06:00