diff --git a/[refs] b/[refs]
index 4dc7610cdc79..3820888f3792 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75d3625e0e86b2d8d77b4e9c6f685fd7ea0d5a96
+refs/heads/master: 97c794a1e37b1ca128ef38f17c069186bfa5fb1b
diff --git a/trunk/Documentation/devicetree/bindings/mtd/gpmc-nand.txt b/trunk/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
index 9f464f906ffb..e7f8d7ed47eb 100644
--- a/trunk/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
+++ b/trunk/Documentation/devicetree/bindings/mtd/gpmc-nand.txt
@@ -29,6 +29,9 @@ Optional properties:
 		"bch4"		4-bit BCH ecc code
 		"bch8"		8-bit BCH ecc code
 
+ - elm_id:	Specifies elm device node. This is required to support BCH
+ 		error correction using ELM module.
+
 For inline partiton table parsing (optional):
 
  - #address-cells: should be set to 1
@@ -46,6 +49,7 @@ Example for an AM33xx board:
 		#address-cells = <2>;
 		#size-cells = <1>;
 		ranges = <0 0 0x08000000 0x2000>;	/* CS0: NAND */
+		elm_id = <&elm>;
 
 		nand@0,0 {
 			reg = <0 0 0>; /* CS0, offset 0 */