Linux v4.5-12013-gc13042362033
- crypto, mailbox, clk merges
This commit is contained in:
		
							parent
							
								
									10af6f3233
								
							
						
					
					
						commit
						62d5948052
					
				| @ -1056,8 +1056,8 @@ index 171085a..cc89d1f 100644 | ||||
| --- a/drivers/clk/sunxi/clk-factors.h
 | ||||
| +++ b/drivers/clk/sunxi/clk-factors.h
 | ||||
| @@ -26,6 +26,7 @@ struct factors_data {
 | ||||
|  	struct clk_factors_config *table; | ||||
|  	void (*getter) (u32 *rate, u32 parent_rate, u8 *n, u8 *k, u8 *m, u8 *p); | ||||
|  	void (*getter)(struct factors_request *req); | ||||
|  	void (*recalc)(struct factors_request *req); | ||||
|  	const char *name; | ||||
| +	int name_idx;
 | ||||
|  }; | ||||
|  | ||||
| @ -238,6 +238,7 @@ CONFIG_TI_CPSW_ALE=m | ||||
| CONFIG_TI_CPTS=y | ||||
| CONFIG_TI_EMIF=m | ||||
| CONFIG_DRM_TILCDC=m | ||||
| # CONFIG_COMMON_CLK_TI_ADPLL is not set | ||||
| # We only need this until the BBB dts is actually updated | ||||
| CONFIG_DRM_TILCDC_SLAVE_COMPAT=y | ||||
| CONFIG_SPI_DAVINCI=m | ||||
| @ -296,6 +297,7 @@ CONFIG_REGULATOR_QCOM_SPMI=m | ||||
| CONFIG_APQ_GCC_8084=m | ||||
| CONFIG_APQ_MMCC_8084=m | ||||
| CONFIG_IPQ_GCC_806X=m | ||||
| CONFIG_IPQ_GCC_4019=m | ||||
| CONFIG_MSM_GCC_8660=m | ||||
| CONFIG_MSM_GCC_8960=m | ||||
| CONFIG_MSM_MMCC_8960=m | ||||
|  | ||||
| @ -62,6 +62,7 @@ CONFIG_KEYSTONE_IRQ=m | ||||
| CONFIG_PCI_KEYSTONE=y | ||||
| CONFIG_MTD_NAND_DAVINCI=m | ||||
| CONFIG_GPIO_SYSCON=m | ||||
| CONFIG_TI_MESSAGE_MANAGER=m | ||||
| 
 | ||||
| # Tegra (non A15 device options) | ||||
| # CONFIG_ARCH_TEGRA_2x_SOC is not set | ||||
|  | ||||
							
								
								
									
										2
									
								
								gitrev
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								gitrev
									
									
									
									
									
								
							| @ -1 +1 @@ | ||||
| a24e3d414e59ac76566dedcad1ed1d319a93ec14 | ||||
| c130423620331a104492bbbcc49f25125e26a21a | ||||
|  | ||||
| @ -69,7 +69,7 @@ Summary: The Linux kernel | ||||
| # The rc snapshot level | ||||
| %define rcrev 0 | ||||
| # The git snapshot level | ||||
| %define gitrev 21 | ||||
| %define gitrev 22 | ||||
| # Set rpm version accordingly | ||||
| %define rpmversion 4.%{upstream_sublevel}.0 | ||||
| %endif | ||||
| @ -2162,6 +2162,10 @@ fi | ||||
| # | ||||
| #  | ||||
| %changelog | ||||
| * Wed Mar 23 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git22.1 | ||||
| - Linux v4.5-12013-gc13042362033 | ||||
| - crypto, mailbox, clk merges | ||||
| 
 | ||||
| * Wed Mar 23 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git21.1 | ||||
| - Linux v4.5-11787-ga24e3d414e59 | ||||
| - akpm, kvm, rdma | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user