From: Linus Torvalds Date: Fri, 25 Sep 2009 00:08:56 +0000 (-0700) Subject: Merge branch 'for-linus' of git://repo.or.cz/cris-mirror X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5f8fe4270e53d38421ba34c428c3b58933b48e50;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git Merge branch 'for-linus' of git://repo.or.cz/cris-mirror * 'for-linus' of git://repo.or.cz/cris-mirror: CRIS: Cleanup linker script using new linker script macros. ARRAY_SIZE changes CRIS: convert to asm-generic/hardirq.h CRISv10: Don't autonegotiate if autonegotiation is off CRIS: fix defconfig build failure CRIS: add pgprot_noncached --- 5f8fe4270e53d38421ba34c428c3b58933b48e50