]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branches 'next/soc' and 'next/deletion' into for-next
authorArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 20:04:57 +0000 (22:04 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 20:04:57 +0000 (22:04 +0200)
commitec3e1f70cbce19d9a6d46779246c30cb1c68c7d9
tree10a53e2651b20490dd714d68c5d81c411f6a7223
parent86acabf2510f91bd4dbb71c3720d755b06ad966c
parent76780127914d5dc69a458eda5e471e65a5fd3dc9
parent4702abd3f9728893ad5b0f4389e1902588510459
Merge branches 'next/soc' and 'next/deletion' into for-next

Conflicts:
arch/arm/mach-nuc93x/mach-nuc932evb.c
arch/arm/Kconfig
arch/arm/Makefile