Merge commit 'v3.1' into devicetree/next

2011-10-24 17:03:35 +02:00
parent 5762c20593 c3b92c8787
commit 2bf6f675fa
153 changed files with 955 additions and 603 deletions
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -197,6 +197,11 @@ struct dm_target {
 	 * whether or not its underlying devices have support.
 	 */
 	unsigned discards_supported:1;
+
+	/*
+	 * Set if this target does not return zeroes on discarded blocks.
+	 */
+	unsigned discard_zeroes_data_unsupported:1;
 };

 /* Each target can link one of these into the table */