Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
From Nicolas Ferre, first fixes series for 3.12: - removal of void IRQF_DISABLED flag in timer drivers - two little fixes in DT for at91sam9x5 family * tag 'at91-fixes' of git://github.com/at91linux/linux-at91 : ARM: at91: remove IRQF_DISABLED ARM: at91: at91sam9x5: set default mmc[01] pinctrl-names ARM: at91: serial: fix wrong pinctrl_usart2_rts Signed-off-by:Olof Johansson <olof@lixom.net>
Showing
- arch/arm/boot/dts/at91sam9x5.dtsi 4 additions, 2 deletionsarch/arm/boot/dts/at91sam9x5.dtsi
- arch/arm/mach-at91/at91rm9200_time.c 1 addition, 1 deletionarch/arm/mach-at91/at91rm9200_time.c
- arch/arm/mach-at91/at91sam926x_time.c 1 addition, 1 deletionarch/arm/mach-at91/at91sam926x_time.c
- arch/arm/mach-at91/at91x40_time.c 1 addition, 1 deletionarch/arm/mach-at91/at91x40_time.c
Please register or sign in to comment