]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'devel-stable' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 3 Sep 2015 14:28:50 +0000 (15:28 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 3 Sep 2015 14:28:50 +0000 (15:28 +0100)
commitce8e055b792144aa7ecb8571cfa4b905a05dbad3
treeaf683b2cb62f7e5ee18cb109d15dcfd43769b984
parentc6385c3a691648431ed1a48221ebb7c28a3a1245
parentd9fab16edb308e7d5d1f10140b3845efeeadc8aa
Merge branch 'devel-stable' into for-linus

Conflicts:
drivers/perf/arm_pmu.c
arch/arm/Kconfig
arch/arm/kernel/setup.c