diff --git a/[refs] b/[refs]
index 38c1b05f3beb..f56b33cc5035 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b776eb5426752d4e53354ac89e3710d857e09a7
+refs/heads/master: de26103de56a0c482ad21296eae9b06deefc8e62
diff --git a/trunk/include/linux/scatterlist.h b/trunk/include/linux/scatterlist.h
index 42daf5e15265..df7ddcee7c4b 100644
--- a/trunk/include/linux/scatterlist.h
+++ b/trunk/include/linux/scatterlist.h
@@ -41,6 +41,11 @@ static inline void sg_set_page(struct scatterlist *sg, struct page *page)
 {
 	unsigned long page_link = sg->page_link & 0x3;
 
+	/*
+	 * In order for the low bit stealing approach to work, pages
+	 * must be aligned at a 32-bit boundary as a minimum.
+	 */
+	BUG_ON((unsigned long) page & 0x03);
 #ifdef CONFIG_DEBUG_SG
 	BUG_ON(sg->sg_magic != SG_MAGIC);
 #endif