]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 59f26c0 f9f697a)
Merge branch 'next/drivers' into for-next
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 20:13:28 +0000 (22:13 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 20:13:28 +0000 (22:13 +0200)
commit435f4c6d5242317472b220a5fa0e82ae25e58a8a
treedb62729c5c2d65c2503ff3ec819ddb8e19dceaactree | snapshot
parent59f26c0311cb5b5959aa43f0092f705c83cb087bcommit | diff
parentf9f697a77d23dfbd00bd75b27b67fea1fd7a1767commit | diff
Merge branch 'next/drivers' into for-next

Conflicts:
arch/arm/mach-omap2/devices.c
arch/arm/mach-picoxcell/common.c
arch/arm/mach-ux500/cpu-db8500.c
14 files changed:
arch/arm/Kconfig diff1 | diff2 | blob | history
arch/arm/mach-omap2/Makefile diff1 | diff2 | blob | history
arch/arm/mach-omap2/devices.c diff1 | diff2 | blob | history
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c diff1 | diff2 | blob | history
arch/arm/mach-picoxcell/common.c diff1 | diff2 | blob | history
arch/arm/mach-s3c24xx/Kconfig diff1 | diff2 | blob | history
arch/arm/mach-s3c24xx/Makefile diff1 | diff2 | blob | history
arch/arm/mach-socfpga/Kconfig diff1 | diff2 | blob | history
arch/arm/mach-ux500/board-mop500-sdi.c diff1 | diff2 | blob | history
arch/arm/mach-ux500/cpu-db8500.c diff1 | diff2 | blob | history
arch/arm/mach-ux500/devices-db8500.c diff1 | diff2 | blob | history
drivers/crypto/ux500/cryp/cryp_core.c diff1 | diff2 | blob | history
drivers/crypto/ux500/hash/hash_core.c diff1 | diff2 | blob | history
drivers/pinctrl/Kconfig diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules