From 8f9d3a8c3692f7b4122c360684e933ac68cde740 Mon Sep 17 00:00:00 2001
From: Zachary Bedell <pendorbound@gmail.com>
Date: Mon, 23 Jan 2012 03:37:06 +0100
Subject: [PATCH] 	* grub-core/fs/zfs/zfs.c (uberblock_verify): New
 parameter size. 	All users updated. 	(find_bestub): Determine
 correct size. 	(fill_vdev_info_real): Fill ashift. New argument. All users
 updated. 	(scan_disk): Align the size down. 	Call check pool before
 find_bestub to have ashift. Note: real text was accidently commited 2 commits
 ago.

	Also-By: Richard Laager <rlaager@wiktel.com>

	Also-By: Vladimir Serbinenko <phcoder@gmail.com>
---
 ChangeLog | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index c0b4a2463..431bf4493 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-01-22  Vladimir Serbinenko  <phcoder@gmail.com>
+2012-01-22  Zachary Bedell <pendorbound@gmail.com>
+2012-01-22  Richard Laager <rlaager@wiktel.com>
+
+	* grub-core/fs/zfs/zfs.c (uberblock_verify): New parameter size.
+	All users updated.
+	(find_bestub): Determine correct size.
+	(fill_vdev_info_real): Fill ashift. New argument. All users updated.
+	(scan_disk): Align the size down.
+	Call check pool before find_bestub to have ashift.
+
 2012-01-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/lib/relocator.c (malloc_in_range): Remove couple of