forked from rpms/kernel
		
	Linux v4.1-rc3-177-gf0897f4cc0fc
This commit is contained in:
		
							parent
							
								
									2844a7d7e1
								
							
						
					
					
						commit
						ea896256a4
					
				@ -13,7 +13,7 @@ Signed-off-by: Josh Boyer <jwboyer@redhat.com>
 | 
			
		||||
 1 file changed, 2 insertions(+), 1 deletion(-)
 | 
			
		||||
 | 
			
		||||
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
 | 
			
		||||
index 39748bb3a543..72edfeedb326 100644
 | 
			
		||||
index 7ccba395c9dd..9cbdbccf3dc3 100644
 | 
			
		||||
--- a/drivers/acpi/osl.c
 | 
			
		||||
+++ b/drivers/acpi/osl.c
 | 
			
		||||
@@ -44,6 +44,7 @@
 | 
			
		||||
@ -24,7 +24,7 @@ index 39748bb3a543..72edfeedb326 100644
 | 
			
		||||
 
 | 
			
		||||
 #include <asm/io.h>
 | 
			
		||||
 #include <asm/uaccess.h>
 | 
			
		||||
@@ -255,7 +256,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
 | 
			
		||||
@@ -252,7 +253,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp);
 | 
			
		||||
 acpi_physical_address __init acpi_os_get_root_pointer(void)
 | 
			
		||||
 {
 | 
			
		||||
 #ifdef CONFIG_KEXEC
 | 
			
		||||
 | 
			
		||||
@ -67,7 +67,7 @@ Summary: The Linux kernel
 | 
			
		||||
# The rc snapshot level
 | 
			
		||||
%define rcrev 3
 | 
			
		||||
# The git snapshot level
 | 
			
		||||
%define gitrev 2
 | 
			
		||||
%define gitrev 3
 | 
			
		||||
# Set rpm version accordingly
 | 
			
		||||
%define rpmversion 4.%{upstream_sublevel}.0
 | 
			
		||||
%endif
 | 
			
		||||
@ -2212,6 +2212,9 @@ fi
 | 
			
		||||
#
 | 
			
		||||
# 
 | 
			
		||||
%changelog
 | 
			
		||||
* Fri May 15 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc3.git3.1
 | 
			
		||||
- Linux v4.1-rc3-177-gf0897f4cc0fc
 | 
			
		||||
 | 
			
		||||
* Thu May 14 2015 Josh Boyer <jwboyer@fedoraproject.org>
 | 
			
		||||
- Fix non-empty dir removal in overlayfs (rhbz 1220915)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user