]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'depends/rmk/devel-stable' into for-next
authorOlof Johansson <olof@lixom.net>
Mon, 12 Dec 2011 00:02:35 +0000 (16:02 -0800)
committerOlof Johansson <olof@lixom.net>
Mon, 12 Dec 2011 00:02:35 +0000 (16:02 -0800)
commit253bb9dd404264e4984660d2502057e1341fe0be
tree84add7cd9e69db9334acb291a7dd592b6f1b0a41
parentb4d99149015a8e20bb05c2db6f377d92c20f529b
parentad622671a4da0b6db1c1382e6345e1361c5fbab8
Merge branch 'depends/rmk/devel-stable' into for-next

Same conflict resolution as sfr has been using on -next.

Conflicts:
arch/arm/mach-at91/setup.c

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/Kconfig
arch/arm/mach-at91/setup.c
arch/arm/mach-pxa/mioa701.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/spitz.c
arch/arm/mach-pxa/tosa.c