From: Olof Johansson Date: Mon, 7 Oct 2013 16:32:54 +0000 (-0700) Subject: Merge branch 'next/soc' into for-next X-Git-Tag: next-20131017~12^2~28 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=8dbee61471ea6cf53edcc0b73e8af2ec54da0dd6 Merge branch 'next/soc' into for-next * next/soc: ARM: davinci: remove deprecated IRQF_DISABLED Signed-off-by: Olof Johansson --- 8dbee61471ea6cf53edcc0b73e8af2ec54da0dd6 diff --cc arch/arm/arm-soc-for-next-contents.txt index 574ddb7c4fa0,000000000000..ee82c210c51b mode 100644,000000..100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@@ -1,21 -1,0 +1,23 @@@ + + +next/cleanup + shark/removal + git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/del-shark-for-v3.13 + +next/soc + samsung/s3c64xx-clk + http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-clk-s3c64xx ++ patch ++ ARM: davinci: remove deprecated IRQF_DISABLED + +next/drivers + davinci/gpio + git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v3.13/gpio + +next/dt + samsung/s3c64xx-dt + http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-dt-s3c64xx + ux500/dt + git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dt-for-v3.13-2 + patch "ARM: ux500: enable appended dtb in u8500_defconfig" +