From: Guangyu Sun <guangyu.sun@oracle.com>
Date: Tue, 3 Jul 2012 21:33:43 +0000 (-0700)
Subject: Merge tag 'v3.0.34' into uek2-2.6.39-300#14252075
X-Git-Tag: v2.6.39-400.9.0~505
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a9fa90c10c03f4bb6b909ce9c22321035544a814;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'v3.0.34' into uek2-2.6.39-300#14252075

This is the 3.0.34 stable release

Conflicts:
	arch/x86/include/asm/pgtable-3level.h

Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
---

a9fa90c10c03f4bb6b909ce9c22321035544a814