From 6c87c87c9ee12bd9118307c45a7c8b53e9d59317 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 26 Oct 2010 14:22:30 -0700
Subject: [PATCH] --- yaml --- r: 217519 b: refs/heads/master c:
 d88262623fb58853ed60fb110141c435de26e3de h: refs/heads/master i:   217517:
 de0609f4b204a375e3eb3a4e12abc0c8f3c9bb9d   217515:
 d1ca78ccd05ea224dcd6513d1d8dc834cd11e0c2   217511:
 2a05f4ba7f4ab05d6337d8f7632dbbce483dd8ab   217503:
 06c4414555b835027a9ff1319b1c49eebb9199e2 v: v3

---
 [refs]                                  | 2 +-
 trunk/include/asm-generic/vmlinux.lds.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 15d8883e0f47..4e8034d0b8eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d356c0b680d15e0187de48aa303e541b461ea794
+refs/heads/master: d88262623fb58853ed60fb110141c435de26e3de
diff --git a/trunk/include/asm-generic/vmlinux.lds.h b/trunk/include/asm-generic/vmlinux.lds.h
index aaf1105d9d91..2c0fc10956ba 100644
--- a/trunk/include/asm-generic/vmlinux.lds.h
+++ b/trunk/include/asm-generic/vmlinux.lds.h
@@ -637,7 +637,7 @@
 
 #ifdef CONFIG_BLK_DEV_INITRD
 #define INIT_RAM_FS							\
-	. = ALIGN(PAGE_SIZE);						\
+	. = ALIGN(4);							\
 	VMLINUX_SYMBOL(__initramfs_start) = .;				\
 	*(.init.ramfs)							\
 	VMLINUX_SYMBOL(__initramfs_end) = .;