]> 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)
commitbe84d92d95fb97936a66ae30e3258a2f1765cdbe
treeaf683b2cb62f7e5ee18cb109d15dcfd43769b984
parentb9c431f447fd6621d8073cbcaac97fe61b469571
parentd18a25341f08e3035bcdc314128634fcd1d1d5c6
Merge branch 'devel-stable' into for-linus

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