]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2
authorArnd Bergmann <arnd@arndb.de>
Mon, 12 Nov 2012 20:57:52 +0000 (21:57 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 12 Nov 2012 20:57:52 +0000 (21:57 +0100)
commit509b2722f45d241ece9c5c06fa096bd6cd096374
treef3f94c341531014a3e2cd175984c553671458ea1
parente68bb186da76e0ca5a415527e86b8bb724bd13d1
parent85c1fd3e6414faddf224df308f395c9d431cfa5e
parent14f111a526f842ff27c3e5e9a82a4d80dc85ecdc
parent416ed9cd52cb38bd4718d66625f240dbd684d8ca
Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2

These are all dependencies for the renesas/boards2 branch.

Conflicts:
arch/arm/configs/marzen_defconfig
arch/arm/boot/dts/Makefile
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/mach-shmobile/clock-r8a7779.c
arch/arm/mach-shmobile/setup-r8a7779.c
sound/soc/sh/fsi.c